From 926f621d288009e85ae456d73efdf938cc441ec1 Mon Sep 17 00:00:00 2001
From: geh <1923421292@qq.com>
Date: Fri, 26 Sep 2025 11:02:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9D=A3=E6=9F=A5=E6=A3=80=E6=9F=A5=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SUBQHSE/BLL/WebService/CNCECHSSEGetWebService.cs  | 14 +++++++++++---
 SUBQHSE/FineUIPro.Web/SysManage/UserList.aspx     |  2 +-
 SUBQHSE/FineUIPro.Web/SysManage/UserListEdit.aspx |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/SUBQHSE/BLL/WebService/CNCECHSSEGetWebService.cs b/SUBQHSE/BLL/WebService/CNCECHSSEGetWebService.cs
index 7297023..53acc66 100644
--- a/SUBQHSE/BLL/WebService/CNCECHSSEGetWebService.cs
+++ b/SUBQHSE/BLL/WebService/CNCECHSSEGetWebService.cs
@@ -1687,6 +1687,7 @@
             string code = "0";
             using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
             {
+                string filePath = Funs.SGGLUrl;
                 try
                 {
                     var upCheckReport = from x in db.View_DCGL_CheckRectifyListFromSUB
@@ -1714,7 +1715,7 @@
                                             ToKeyId = x.ToKeyId2,
                                             AttachSource = x.AttachSource2,
                                             AttachUrl = x.AttachUrl2,
-                                            FilePath = Funs.SGGLUrl
+                                            FilePath = filePath
                                             //////附件转为字节传送
                                             //FileContext = FileStructService.GetMoreFileStructByAttachUrl(x.AttachUrl2),
                                         };
@@ -1726,9 +1727,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();
 
@@ -1742,8 +1746,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/SUBQHSE/FineUIPro.Web/SysManage/UserList.aspx b/SUBQHSE/FineUIPro.Web/SysManage/UserList.aspx
index 6484787..7d73942 100644
--- a/SUBQHSE/FineUIPro.Web/SysManage/UserList.aspx
+++ b/SUBQHSE/FineUIPro.Web/SysManage/UserList.aspx
@@ -51,7 +51,7 @@
                                    <f:Button ID="btnImport" ToolTip="导入" Icon="ApplicationAdd" Hidden="true" runat="server" Text="导入"
                                     OnClick="btnImport_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>
diff --git a/SUBQHSE/FineUIPro.Web/SysManage/UserListEdit.aspx b/SUBQHSE/FineUIPro.Web/SysManage/UserListEdit.aspx
index d2cb88e..b1c1925 100644
--- a/SUBQHSE/FineUIPro.Web/SysManage/UserListEdit.aspx
+++ b/SUBQHSE/FineUIPro.Web/SysManage/UserListEdit.aspx
@@ -69,7 +69,7 @@
                             <f:RadioItem Value="1" Text="男"   />
                             <f:RadioItem Value="2" Text="女" />
                         </f:RadioButtonList>
-                        <f:CheckBox runat="server" Label="是否督查人员" LabelAlign="Right"  ID="cbIsInspectionBrigade"/>
+                        <f:CheckBox runat="server" Label="是否是集团检查整改负责人" LabelAlign="Right" ID="cbIsInspectionBrigade" LabelWidth="200px" />
                     </Items>
                 </f:FormRow>
                 <f:FormRow runat="server" ID="trProject">