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

查询修改

Uat_Study
he 2022-04-01 10:38:20 +08:00
parent cee10f18ff
commit 9d2455a898
4 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
View File

@ -50,6 +50,10 @@ namespace IRaCIS.Core.Application.ViewModel
public string ObjectTypeId { get; set; } = string.Empty;
public string ObjectTypeValue { get; set; } = string.Empty;
public string ObjectTypeValueCN { get; set; } = string.Empty;
public bool? IsShowByTrialConfig { get; set; }
public string ByTrialConfig { get; set; } = string.Empty;

8
IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs
View File

@ -43,7 +43,9 @@ namespace IRaCIS.Core.Application.Service
from leftModuleType in ModuleTypetemp.DefaultIfEmpty()
join OptTypeId in _repository.GetQueryable<Dictionary>() on data.OptTypeId equals OptTypeId.Id.ToString() into OptTypeIdtemp
from leftOptTypeId in OptTypeIdtemp.DefaultIfEmpty()
select new FrontAuditConfigView()
join ObjectTypeId in _repository.GetQueryable<Dictionary>() on data.ObjectTypeId equals ObjectTypeId.Id.ToString() into ObjectTypeIdtemp
from leftObjectTypeIdtemp in ObjectTypeIdtemp.DefaultIfEmpty()
select new FrontAuditConfigView()
{
IsShowParent = data.IsShowParent,
@ -74,7 +76,9 @@ namespace IRaCIS.Core.Application.Service
DictionaryKey=data.DictionaryKey,
EnumType=data.EnumType,
ObjectTypeId=data.ObjectTypeId,
IsShowByTrialConfig=data.IsShowByTrialConfig,
ObjectTypeValue = leftObjectTypeIdtemp.Value,
ObjectTypeValueCN = leftObjectTypeIdtemp.ValueCN,
IsShowByTrialConfig =data.IsShowByTrialConfig,
ByTrialConfig=data.ByTrialConfig,
};

5
IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
View File

@ -204,7 +204,10 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
public string UserFirstName { get; set; } = string.Empty;
public string UserLastName { get; set; } = string.Empty;
public string SubjectCode { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty;

27
IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
View File

@ -43,12 +43,36 @@ namespace IRaCIS.Core.Application.Service.Inspection
join moduleTyped in _repository.GetQueryable<Dictionary>().Where(x => x.Code == "ModuleType") on 1 equals 1
join moduleTypec in _repository.GetQueryable<Dictionary>() on new { ParentId = moduleTyped.Id, ModuleType=data.ModuleType } equals new { ParentId=moduleTypec.ParentId.Value, ModuleType= moduleTypec.Value } into moduleTypectemp
join moduleTypec in _repository.GetQueryable<Dictionary>() on new { ParentId = moduleTyped.Id, ModuleType = data.ModuleType } equals new { ParentId = moduleTypec.ParentId.Value, ModuleType = moduleTypec.Value } into moduleTypectemp
from leftmoduleTypec in moduleTypectemp.DefaultIfEmpty()
join childrenTyped in _repository.GetQueryable<Dictionary>().Where(x => x.Code == "ChildrenType") on 1 equals 1
join childrenTypec in _repository.GetQueryable<Dictionary>() on new { ParentId = childrenTyped.Id, ModuleType = data.ChildrenType } equals new { ParentId = childrenTypec.ParentId.Value, ModuleType = childrenTypec.Value } into childrenTypectemp
from leftchildrenTypec in childrenTypectemp.DefaultIfEmpty()
join ObjectTyped in _repository.GetQueryable<Dictionary>().Where(x => x.Code == "ObjectType") on 1 equals 1
join ObjectTypec in _repository.GetQueryable<Dictionary>() on new { ParentId = ObjectTyped.Id, ModuleType = data.ObjectType } equals new { ParentId = ObjectTypec.ParentId.Value, ModuleType = ObjectTypec.Value } into objectTypetemp
from leftObjectType in objectTypetemp.DefaultIfEmpty()
join OptTyped in _repository.GetQueryable<Dictionary>().Where(x => x.Code == "OptType") on 1 equals 1
join OptTypec in _repository.GetQueryable<Dictionary>() on new { ParentId = OptTyped.Id, ModuleType = data.OptType } equals new { ParentId = OptTypec.ParentId.Value, ModuleType = OptTypec.Value } into optTypetemp
from leftOptType in optTypetemp.DefaultIfEmpty()
join frontAuditConfig in _repository.GetQueryable<FrontAuditConfig>().Where(x=>x.ObjectTypeId!=null) on new
{
ModuleTypeId = leftmoduleTypec.Id.ToString(),
ChildrenTypeId = leftchildrenTypec.Id.ToString(),
ObjectTypeId = leftObjectType.Id.ToString(),
OptTypeId = leftOptType.Id.ToString(),
} equals new
{
frontAuditConfig.ModuleTypeId,
frontAuditConfig.ChildrenTypeId,
frontAuditConfig.ObjectTypeId,
frontAuditConfig.OptTypeId,
} into frontAuditConfigtemp
from leftfrontAuditConfig in frontAuditConfigtemp.DefaultIfEmpty()
select new GetDataInspectionOutDto()
{
CreateTime = data.CreateTime,
@ -86,6 +110,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
SiteCode=data.SiteCode,
ResearchProgramNo=data.ResearchProgramNo,
ObjectType=data.ObjectType,
Description=leftfrontAuditConfig.Description,
};
query = query.WhereIf(!dto.BlindName.IsNullOrEmpty(), x => x.BlindName == dto.BlindName)