From 463c81a689a5307eae786db53e00458e79f2e080 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Fri, 26 Sep 2025 15:10:33 +0800
Subject: [PATCH] 1

---
 SGGL/BLL/WebService/CNCECHSSEWebService.cs | 14 +++++++++++---
 SGGL/FineUIPro.Web/Person/PersonEdit.aspx  |  2 +-
 SGGL/FineUIPro.Web/Person/PersonLib.aspx   |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/SGGL/BLL/WebService/CNCECHSSEWebService.cs b/SGGL/BLL/WebService/CNCECHSSEWebService.cs
index 686322e0..5078ac75 100644
--- a/SGGL/BLL/WebService/CNCECHSSEWebService.cs
+++ b/SGGL/BLL/WebService/CNCECHSSEWebService.cs
@@ -1973,6 +1973,7 @@
             string code = "0";
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
+                string filePath = Funs.SGGLUrl;
                 try
                 {
                     var upCheckReport = from x in db.View_DCGL_CheckRectifyListFromSUB
@@ -2000,7 +2001,7 @@
                                             ToKeyId = x.ToKeyId2,
                                             AttachSource = x.AttachSource2,
                                             AttachUrl = x.AttachUrl2,
-                                            FilePath = Funs.SGGLUrl
+                                            FilePath = filePath
                                             //////附件转为字节传送
                                             //FileContext = FileStructService.GetMoreFileStructByAttachUrl(x.AttachUrl2),
                                         };
@@ -2012,9 +2013,12 @@
                      { "token", ServerService.GetToken().Token }
                 };
                     var pushContent = JsonConvert.SerializeObject(upCheckReport.ToList());
+
+                    //ErrLogInfo.WriteLog($"【集团检查整改上报数据】：{pushContent}");
                     var strJosn = APIGetHttpService.Http(baseurl, "Post", contenttype, newToken, pushContent);
                     if (!string.IsNullOrEmpty(strJosn))
                     {
+                        //ErrLogInfo.WriteLog($"【集团检查整改上报数据结果】：{strJosn}");
                         JObject obj = JObject.Parse(strJosn);
                         code = obj["code"].ToString();
 
@@ -2028,8 +2032,12 @@
                                     var newCheckRectify = db.DCGL_Check_CheckRectify.FirstOrDefault(e => e.CheckRectifyId == item);
                                     if (newCheckRectify != null)
                                     {
-                                        newCheckRectify.HandleState = BLL.Const.State_3;    //已完成                              
-                                        db.SubmitChanges();
+                                        var getNoUpdateItem = db.DCGL_Check_CheckRectifyItem.FirstOrDefault(x => x.CheckRectifyId == checkRectifyId && !x.RealEndDate.HasValue);
+                                        if (getNoUpdateItem == null)
+                                        {//问题全部整改完成
+                                            newCheckRectify.HandleState = BLL.Const.State_3;    //已完成                              
+                                            db.SubmitChanges();
+                                        }
                                     }
                                 }
                             }
diff --git a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx
index bb6ea8ac..de375a63 100644
--- a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx
+++ b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx
@@ -320,7 +320,7 @@
                                                             <f:RadioItem Text="施工管理" Value="1" Selected="true" />
                                                             <f:RadioItem Text="QHSE" Value="2" />
                                                         </f:RadioButtonList>
-                                                        <f:CheckBox runat="server" Label="是否督查人员" LabelWidth="120px" LabelAlign="Right"  ID="cbIsInspectionBrigade"/>
+                                                        <f:CheckBox runat="server" Label="是否是集团检查整改负责人" LabelWidth="120px" LabelAlign="Right"  ID="cbIsInspectionBrigade"/>
                                                         <f:Label runat="server" ID="lb2"></f:Label>
                                                         <f:Label runat="server" ID="lb3"></f:Label>
                                                     </Items>
diff --git a/SGGL/FineUIPro.Web/Person/PersonLib.aspx b/SGGL/FineUIPro.Web/Person/PersonLib.aspx
index 56b6e642..32949575 100644
--- a/SGGL/FineUIPro.Web/Person/PersonLib.aspx
+++ b/SGGL/FineUIPro.Web/Person/PersonLib.aspx
@@ -54,7 +54,7 @@
                                    <f:Button ID="btnIDCard" Text="刷新信息" Icon="ArrowRefresh" Hidden="true" runat="server"
                                     OnClick="btnIDCard_Click">
                                 </f:Button>
-                                <f:Button ID="btnUpdata" Text="推送督查人员" Icon="PageSave" runat="server"   ConfirmText="确定推送？"
+                                <f:Button ID="btnUpdata" Text="推送集团检查负责人" Icon="PageSave" runat="server"   ConfirmText="确定推送？"
             ToolTip="推送" ValidateForms="SimpleForm1" OnClick="btnPush_Click" MarginRight="10px">
   </f:Button>
                             </Items>