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

修改一版

Uat_Study
he 2022-05-05 17:43:13 +08:00
parent 54e717d4af
commit 3ebeacf3c9
5 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -156,6 +156,21 @@
子类
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionAddDTO.ObjectType">
<summary>
对象名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionAddDTO.OptType">
<summary>
操作类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionAddDTO.ModuleType">
<summary>
功能模块
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionAddDTO.CreateUserName">
<summary>
创建人名称
@ -196,11 +211,6 @@
项目编码
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionAddDTO.ObjectType">
<summary>
对象名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionAddDTO.Identification">
<summary>
标识

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

@ -24,19 +24,28 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
public Guid? SiteId { get; set; }
public Guid? SubjectId { get; set; }
public Guid? SubjectVisitId { get; set; }
public string ModuleType { get; set; } = string.Empty;
public string OptType { get; set; } = string.Empty;
/// <summary>
/// 子类
/// </summary>
public Guid? ChildrenType { get; set; }
/// <summary>
/// 对象名称
/// </summary>
public Guid? ObjectType { get; set; }
/// <summary>
/// 操作类型
/// </summary>
public Guid? OptType { get; set; }
/// <summary>
/// 功能模块
/// </summary>
public Guid? ModuleType { get; set; }
public string BlindName { get; set; } = string.Empty;
public string Reason { get; set; } = string.Empty;
/// <summary>
/// 子类
/// </summary>
public string ChildrenType { get; set; } = string.Empty;
public bool IsSign { get; set; }
public string JsonDetail { get; set; } = string.Empty;
@ -84,11 +93,6 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
public List<EnumList> EnumList { get; set; } = new List<EnumList> { };
/// <summary>
/// 对象名称
/// </summary>
public string ObjectType { get; set; } = string.Empty;
/// <summary>
/// 标识
/// </summary>

5
IRaCIS.Core.Application/Service/Visit/SubjectService.cs
View File

@ -46,13 +46,13 @@ namespace IRaCIS.Application.Services
};
bool isadd = false;
Subject? mapedSubject = null;
if (subjectCommand.Id == null) //insert
{
isadd = true;
mapedSubject= await _subjectRepository.InsertFromDTOAsync(subjectCommand, false, verifyExp1);
@ -66,6 +66,7 @@ namespace IRaCIS.Application.Services
svlist.ForEach(t =>
{
t.Subject = mapedSubject;
t.SubjectId = mapedSubject.Id;
t.TrialId = subjectCommand.TrialId;
t.SiteId = subjectCommand.SiteId;

3
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -94,8 +94,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
// 访视
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(SubjectVisit)))
{
var subjectCode = (item.Entity as SubjectVisit).Subject?.Code;
await InsertInspection<SubjectVisit>(item, type, x => new DataInspection()
{
SubjectCode= subjectCode,
SubjectId=x.SubjectId,
SubjectVisitId = x.Id,
SubjectVisitName=x.VisitName,
});

5
IRaCIS.Core.Infra.EFCore/Repository/Repository.cs
View File

@ -601,6 +601,11 @@ namespace IRaCIS.Core.Infra.EFCore
var JsonData = JsonConvert.DeserializeObject<IDictionary<string, object>>(json);
if (JsonData == null)
{
return json;
}
foreach (var item in JsonData.Keys)
{
var datefirst = list.FirstOrDefault(x => x.Code.ToLower() == item.ToLower());