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

修改

Uat_Study
he 2022-08-12 17:54:09 +08:00
parent 791e61c3e4
commit 9e719f5158
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
View File

@ -14,10 +14,7 @@ namespace IRaCIS.Core.Application.ViewModel
{ {
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
///// <summary>
///// 类型枚举
///// </summary>
//public OrganType OrganType { get; set; }
public List<Guid> OrganIds { get; set; } public List<Guid> OrganIds { get; set; }
} }
@ -30,7 +27,7 @@ namespace IRaCIS.Core.Application.ViewModel
public string Part { get; set; } public string Part { get; set; }
public string TULOC { get; set; } public string TULOC { get; set; }
public string TULAT { get; set; } public string TULAT { get; set; }
public string TypeName { get; set; }
public DateTime CreateTime { get; set; } public DateTime CreateTime { get; set; }
/// <summary> /// <summary>
@ -67,7 +64,7 @@ namespace IRaCIS.Core.Application.ViewModel
public string? Part { get; set; } public string? Part { get; set; }
public string? TULOC { get; set; } public string? TULOC { get; set; }
public string? TULAT { get; set; } public string? TULAT { get; set; }
public string? TypeName { get; set; }
/// <summary> /// <summary>
/// 类型枚举 /// 类型枚举
@ -83,8 +80,7 @@ namespace IRaCIS.Core.Application.ViewModel
///<summary>OrganInfoQuery 列表查询参数模型</summary> ///<summary>OrganInfoQuery 列表查询参数模型</summary>
public class OrganInfoQuery public class OrganInfoQuery
{ {
///<summary> 类型名称</summary>
public string? TypeName { get; set; }
/// <summary> /// <summary>
/// 类型枚举 /// 类型枚举

6
IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs
View File

@ -41,7 +41,7 @@ namespace IRaCIS.Core.Application.Service
public async Task<List<OrganInfoView>> GetOrganInfoList(OrganInfoQuery inQuery) public async Task<List<OrganInfoView>> GetOrganInfoList(OrganInfoQuery inQuery)
{ {
var organInfoQueryable = _organInfoRepository var organInfoQueryable = _organInfoRepository
.WhereIf(!inQuery.TypeName.IsNullOrEmpty(),x=>x.TypeName==inQuery.TypeName)
.WhereIf(inQuery.OrganType!=null, x => x.OrganType == inQuery.OrganType) .WhereIf(inQuery.OrganType!=null, x => x.OrganType == inQuery.OrganType)
.ProjectTo<OrganInfoView>(_mapper.ConfigurationProvider); .ProjectTo<OrganInfoView>(_mapper.ConfigurationProvider);
return await organInfoQueryable.ToListAsync(); return await organInfoQueryable.ToListAsync();
@ -129,7 +129,7 @@ namespace IRaCIS.Core.Application.Service
Part = data.Part, Part = data.Part,
TULAT = data.TULAT, TULAT = data.TULAT,
TULOC = data.TULOC, TULOC = data.TULOC,
TypeName = data.TypeName,
Remark= data.Remark, Remark= data.Remark,
OrganType=data.OrganType, OrganType=data.OrganType,
}; };
@ -159,7 +159,7 @@ namespace IRaCIS.Core.Application.Service
Part = data.Part, Part = data.Part,
TULAT = data.TULAT, TULAT = data.TULAT,
TULOC = data.TULOC, TULOC = data.TULOC,
TypeName = data.TypeName,
IsCheckd= leftjoin!=null, IsCheckd= leftjoin!=null,
Remark = data.Remark, Remark = data.Remark,
OrganType=data.OrganType, OrganType=data.OrganType,