diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 059d5cb77..09132fede 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -411,6 +411,16 @@
标识
+
+
+ 是否完成
+
+
+
+
+ 是否加入计划
+
+
FrontAuditConfigQuery 列表查询参数模型
@@ -455,6 +465,16 @@
是否有原因
+
+
+ 是否完成
+
+
+
+
+ 是否加入计划
+
+
SystemAnonymizationView 列表视图模型
diff --git a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
index a97fc757b..d815b6ef1 100644
--- a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
@@ -77,7 +77,17 @@ namespace IRaCIS.Core.Application.ViewModel
///
/// 标识
///
- public string Identification { get; set; }
+ public string Identification { get; set; } = string.Empty;
+
+ ///
+ /// 是否完成
+ ///
+ public bool? IsFinish { get; set; }
+
+ ///
+ /// 是否加入计划
+ ///
+ public bool? IsJoinPlan { get; set; }
@@ -199,6 +209,16 @@ namespace IRaCIS.Core.Application.ViewModel
///
public bool? IsHaveReason { get; set; }
+ ///
+ /// 是否完成
+ ///
+ public bool? IsFinish { get; set; }
+
+ ///
+ /// 是否加入计划
+ ///
+ public bool? IsJoinPlan { get; set; }
+
}
diff --git a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs
index d89b4ccc3..9c52ac5ad 100644
--- a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs
@@ -175,6 +175,8 @@ namespace IRaCIS.Core.Application.Service
Identification=data.Identification,
IsHaveReason=data.IsHaveReason,
IsHaveSign=data.IsHaveSign,
+ IsFinish=data.IsFinish,
+ IsJoinPlan=data.IsJoinPlan,
};
query = query
diff --git a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
index 61d35e5c5..6fc690788 100644
--- a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
@@ -127,7 +127,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
ModuleTypeName= leftmoduleTypec.ValueCN,
SignText= lefttrialSign.SignText,
Identification= leftfrontAuditConfig.Identification,
- OptType= leftOptType.ValueCN,
+ OptType= leftOptType.Value,
};
query = query.WhereIf(!dto.BlindName.IsNullOrEmpty(), x => x.BlindName == dto.BlindName)
diff --git a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
index e4a3eb8e0..308a1e3d3 100644
--- a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
+++ b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
@@ -137,6 +137,16 @@ namespace IRaCIS.Core.Domain.Models
///
public bool? IsHaveReason { get; set; }
+ ///
+ /// 是否完成
+ ///
+ public bool? IsFinish { get; set; }
+
+ ///
+ /// 是否加入计划
+ ///
+ public bool? IsJoinPlan { get; set; }
+
}
}