XCKJ/irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
hang
2022-04-14 13:57:35 +08:00
parent 872c16f11f
commit a539eaa4b8
9 changed files with 113 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Common/DictionaryService.cs
+12 -3
View File
@@ -59,10 +59,19 @@ namespace IRaCIS.Application.Services
[HttpPost]
public async Task<IResponseOutput> AddOrUpdateBasicDic(AddOrEditBasicDic addOrEditBasic)
{
if (addOrEditBasic.Id == null)
{
var entity = await _dicRepository.InsertDictionaryAsync(addOrEditBasic);
return ResponseOutput.Ok(entity.Id.ToString());
}
else
{
var entity = await _dicRepository.InsertOrUpdateAsync(addOrEditBasic, true);
return ResponseOutput.Ok(entity.Id.ToString());
}
//var entity = await _dicRepository.InsertOrUpdateAsync(addOrEditBasic, true);
var entity = await _repository.InsertOrUpdateAsync<Dictionary, AddOrEditBasicDic>(addOrEditBasic, true);
return ResponseOutput.Ok(entity.Id.ToString());
//return ResponseOutput.Ok(entity.Id.ToString());
}
IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
+18 -9
View File
@@ -91,17 +91,26 @@ namespace IRaCIS.Core.Application
[HttpPost]
public async Task<PageOutput<TrialSiteSurveyStat>> GetSiteSurveyApprovalList(TrialSiteSurveyStatQuery query)
{
if (_userInfo.IsAdmin)
if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager ||
_userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM ||
_userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM ||
_userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM)
{
return new PageOutput<TrialSiteSurveyStat>(query.PageIndex, query.PageSize, 0, new List<TrialSiteSurveyStat>());
return await _trialRepository
.Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
.WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM, c => c.TrialSiteSurveyList.Where(t => t.State == TrialSiteSurveyEnum.SPMApproved).Count() > 0)
.WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM, c => c.TrialSiteSurveyList.Where(t => t.State == TrialSiteSurveyEnum.CRCSubmitted).Count() > 0)
.ProjectTo<TrialSiteSurveyStat>(_mapper.ConfigurationProvider, new { userTypeEnumInt = _userInfo.UserTypeEnumInt, userId = _userInfo.Id })
.OrderByDescending(t => t.ApprovalRequiredCount).ToPagedListAsync(query.PageIndex, query.PageSize, query.SortField, query.Asc);
}
return await _trialRepository
.Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
.WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM,c=> c.TrialSiteSurveyList.Where(t => t.State == TrialSiteSurveyEnum.SPMApproved).Count()>0)
.WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM, c => c.TrialSiteSurveyList.Where(t => t.State == TrialSiteSurveyEnum.CRCSubmitted).Count() > 0)
.ProjectTo<TrialSiteSurveyStat>(_mapper.ConfigurationProvider, new { userTypeEnumInt = _userInfo.UserTypeEnumInt, userId = _userInfo.Id })
.OrderByDescending(t=>t.ApprovalRequiredCount).ToPagedListAsync(query.PageIndex, query.PageSize, query.SortField, query.Asc);
else
{
return new PageOutput<TrialSiteSurveyStat>(query.PageIndex, query.PageSize, 0, new List<TrialSiteSurveyStat>());
}
}
@@ -121,7 +130,7 @@ namespace IRaCIS.Core.Application
else
{
var trialDocStat = await _trialRepository
.WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin, t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
.Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
.WhereIf(!_userInfo.IsAdmin, c => c.TrialDocumentList.Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId) && !t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id)).Count() > 0)
.ProjectTo<DocSignStat>(_mapper.ConfigurationProvider, new { userTypeEnumInt = _userInfo.UserTypeEnumInt, userId = _userInfo.Id, userTypeId = _userInfo.UserTypeId })
.OrderByDescending(t => t.WaitSignCount)
IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs
+1 -1
View File
@@ -56,7 +56,7 @@ namespace IRaCIS.Application.Services
[HttpGet("{trialId:guid}")]
public async Task<VisitPlanView> GetVisitStageList(Guid trialId)
{
var query = _visitStageRepository.Where(u => u.TrialId == trialId)
var query = _visitStageRepository.AsQueryable(true).Where(u => u.TrialId == trialId)
.ProjectTo<VisitStageDTO>(_mapper.ConfigurationProvider).OrderBy(t => t.VisitNum);
var list = await query.ToListAsync();
var trial = await _repository.FirstOrDefaultAsync<Trial>(t => t.Id == trialId).IfNullThrowException();
IRaCIS.Core.Application/TestService.cs
+5 -4
View File
@@ -7,12 +7,12 @@ using System.ComponentModel.DataAnnotations;
namespace IRaCIS.Application.Services
{
[ ApiExplorerSettings(GroupName = "Institution")]
[ApiExplorerSettings(GroupName = "Institution")]
public class TestService : BaseService
{
private readonly IRepository<Dictionary> _dicRepository;
public TestService(IRepository<Dictionary> dicRepository)
public TestService(IRepository<Dictionary> dicRepository)
{
_dicRepository = dicRepository;
}
@@ -21,13 +21,14 @@ namespace IRaCIS.Application.Services
public string Get(testModel testModel)
{
var c = _dicRepository.Where(t=>t.ParentId!=null).Select(t=>t.MappedValue).First();
var d = _repository.Where<User>().Select(t => t.FullName).FirstOrDefault();
var c = _dicRepository.Where(t => t.ParentId != null).Select(t => t.MappedValue).First();
CultureInfo culture = CultureInfo.CurrentUICulture;
var a = 123;
var b = _localizer["test{0}", "测试"];
return _localizer["test{0}","测试"];
return _localizer["test{0}", "测试"];
}
}