diff --git a/QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs b/QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs index acffee6a..e2bae448 100644 --- a/QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs +++ b/QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs @@ -94,6 +94,8 @@ namespace Tnb.QcMgr.Entities public string? greaterThanValue { get; set; } public string? lessThanValue { get; set; } public string? excontentText { get; set; } + + public string? value { get; set; } public List? excontentOptions { get; set; } } public class ExcontentOption diff --git a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs index 5634bf81..7582e695 100644 --- a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs +++ b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs @@ -284,6 +284,7 @@ namespace Tnb.QcMgr Result.checknum = QcCheckExecH.checknum!; Result.status = QcCheckExecH.status!; Result.checktypes = new List>(); + Result.result = QcCheckExecH.result; var groupkeys = QcCheckExecDs.Select(p=>p.checkindex).Distinct().ToList(); foreach (var key in groupkeys) { @@ -304,6 +305,7 @@ namespace Tnb.QcMgr Item.itemdid = QcCheckExecD.id!; Item.code = QcCheckItems.Where(p => p.id == QcCheckExecD.itemid).First().code!; Item.name = QcCheckItems.Where(p => p.id == QcCheckExecD.itemid).First().name!; + Item.result = QcCheckExecD.result; Item.setData = new ExecItemData(); Item.setData.extype = QcCheckExecD.extype!; Item.setData.excontent = JSON.Deserialize(QcCheckExecD.excontent!);