修改
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
using IRaCIS.Application.Contracts;
|
||||
using IRaCIS.Core.Application.Contracts;
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
@@ -142,6 +143,12 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
|
||||
|
||||
public class DataInspectionDto<T> : InspectionBase, IInspectionDTO, ISignDTO
|
||||
{
|
||||
public DataInspectionDto()
|
||||
{
|
||||
this.AuditInfo.JsonDetail= JsonConvert.SerializeObject(this.OptCommand);
|
||||
}
|
||||
|
||||
|
||||
public T OptCommand { get; set; }
|
||||
}
|
||||
|
||||
@@ -207,7 +214,8 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
|
||||
|
||||
public string ModuleTypeName { get; set; } = string.Empty;
|
||||
|
||||
|
||||
|
||||
public string SignText { get; set; } = string.Empty;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -58,6 +58,11 @@ namespace IRaCIS.Core.Application.Service.Inspection
|
||||
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 trialSign in _repository.GetQueryable<TrialSign>() on data.SignId equals trialSign.Id into trialSigntemp
|
||||
from lefttrialSign in trialSigntemp.DefaultIfEmpty()
|
||||
|
||||
|
||||
join frontAuditConfig in _repository.GetQueryable<FrontAuditConfig>().Where(x=>x.ObjectTypeId!=null) on new
|
||||
{
|
||||
ModuleTypeId = leftmoduleTypec.Id.ToString(),
|
||||
@@ -112,6 +117,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
|
||||
ObjectType=data.ObjectType,
|
||||
Description=leftfrontAuditConfig.Description,
|
||||
ModuleTypeName= leftmoduleTypec.ValueCN,
|
||||
SignText= lefttrialSign.SignText,
|
||||
};
|
||||
|
||||
query = query.WhereIf(!dto.BlindName.IsNullOrEmpty(), x => x.BlindName == dto.BlindName)
|
||||
@@ -157,7 +163,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
|
||||
{
|
||||
return verifyResult;
|
||||
}
|
||||
await AddSignRecordAsync(SignInfo);
|
||||
//await AddSignRecordAsync(SignInfo);
|
||||
}
|
||||
|
||||
IResponseOutput bResult;
|
||||
|
||||
Reference in New Issue
Block a user