From 1a2dbd150ab78ff85e8d521ff967013a7c549a60 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 12 Apr 2022 09:05:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IRaCIS.Core.Application.xml               | 20 +++++++++++++++++
 .../Common/DTO/FrontAuditConfigViewModel.cs   | 22 ++++++++++++++++++-
 .../Service/Common/FrontAuditConfigService.cs |  2 ++
 .../Service/Inspection/InspectionService.cs   |  2 +-
 IRaCIS.Core.Domain/Common/FrontAuditConfig.cs | 10 +++++++++
 5 files changed, 54 insertions(+), 2 deletions(-)

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 @@
             标识
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.FrontAuditConfigView.IsFinish">
+            <summary>
+            是否完成
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.FrontAuditConfigView.IsJoinPlan">
+            <summary>
+            是否加入计划
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.FrontAuditConfigQuery">
             <summary>FrontAuditConfigQuery  列表查询参数模型</summary>
         </member>
@@ -455,6 +465,16 @@
             是否有原因
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.FrontAuditConfigAddOrEdit.IsFinish">
+            <summary>
+            是否完成
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.FrontAuditConfigAddOrEdit.IsJoinPlan">
+            <summary>
+            是否加入计划
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.SystemAnonymizationView">
             <summary> SystemAnonymizationView  列表视图模型 </summary>
         </member>
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
         /// <summary>
         /// 标识
         /// </summary>
-        public string Identification { get; set; }
+        public string Identification { get; set; } = string.Empty;
+
+        /// <summary>
+		/// 是否完成
+		/// </summary>
+		public bool? IsFinish { get; set; }
+
+        /// <summary>
+        /// 是否加入计划
+        /// </summary>
+        public bool? IsJoinPlan { get; set; }
 
 
 
@@ -199,6 +209,16 @@ namespace IRaCIS.Core.Application.ViewModel
         /// </summary>
         public bool? IsHaveReason { get; set; }
 
+        /// <summary>
+        /// 是否完成
+        /// </summary>
+        public bool? IsFinish { get; set; }
+
+        /// <summary>
+        /// 是否加入计划
+        /// </summary>
+        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
 		/// </summary>
 		public bool? IsHaveReason { get; set; }
 
+		/// <summary>
+		/// 是否完成
+		/// </summary>
+		public bool? IsFinish { get; set; }
+
+		/// <summary>
+		/// 是否加入计划
+		/// </summary>
+		public bool? IsJoinPlan { get; set; }
+
 	}
 
 }