From 62fd72edf7d97ef502e4c49fbbdbd8cdbfb0d1ee Mon Sep 17 00:00:00 2001
From: yhw0507 <yhw0508@163.com>
Date: Mon, 8 Jan 2024 09:56:39 +0800
Subject: [PATCH] =?UTF-8?q?20240108=E4=B8=93=E9=A1=B9=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/API/HSSE/APICheckSpecialService.cs | 27 ++++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/SGGL/BLL/API/HSSE/APICheckSpecialService.cs b/SGGL/BLL/API/HSSE/APICheckSpecialService.cs
index 52c92a9d..960422dd 100644
--- a/SGGL/BLL/API/HSSE/APICheckSpecialService.cs
+++ b/SGGL/BLL/API/HSSE/APICheckSpecialService.cs
@@ -106,7 +106,7 @@ namespace BLL
                 {
                     CheckSpecialId = newItem.CheckSpecialId,
                     CheckSpecialCode = newItem.CheckSpecialCode,
-                    CheckItemSetId = newItem.CheckItemSetId,
+                  //  CheckItemSetId = newItem.CheckItemSetId,
                     CheckType = newItem.CheckType,
                     ProjectId = newItem.ProjectId,
                     CheckPerson = newItem.CheckPersonId,
@@ -119,10 +119,15 @@ namespace BLL
                     CompileMan = newItem.CompileManId,
                     States = Const.State_0,
                 };
-                //if (newItem.States != Const.State_1)
-                //{
-                //    newCheckSpecial.States = Const.State_0;
-                //}
+                var getCheckSet=db.Technique_CheckItemSet.FirstOrDefault(x=>x.CheckItemSetId == newItem.CheckItemSetId);
+                if (getCheckSet != null)
+                {
+                    newCheckSpecial.CheckItemSetId = newItem.CheckItemSetId;
+                }
+                else
+                {
+                    newCheckSpecial.CheckItemSetId = null;
+                }
 
                 if (newItem.CheckSpecialDetailItems == null || newItem.CheckSpecialDetailItems.Count() == 0)
                 {
@@ -313,10 +318,20 @@ namespace BLL
                         LimitedDate = Funs.GetNewDateTime(newDetail.LimitedDate),
                         CompletedDate = Funs.GetNewDateTime(newDetail.CompletedDate),
                         Suggestions = newDetail.Suggestions,
-                        WorkArea = newDetail.WorkArea,
+                      //  WorkArea = newDetail.WorkArea,
                         CheckArea = newDetail.WorkAreaId,
                         CheckContent = newDetail.CheckContent,
                     };
+                    var getCheckSet = db.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == newDetail.WorkAreaId);
+                    if (getCheckSet != null)
+                    {
+                        newCheckSpecialDetail.WorkArea = newDetail.CheckItemSetId;
+                    }
+                    else
+                    {
+                        newCheckSpecialDetail.WorkArea = null;
+                    }
+
                     if (newCheckSpecialDetail.CompleteStatus == false && newCheckSpecialDetail.HandleStep.Contains("1") && string.IsNullOrEmpty(newCheckSpecialDetail.HiddenHazardType))
                     {
                         newCheckSpecialDetail.HiddenHazardType = "1";