From 6b907fa5717a6d4652a1211f22f52e3a8ee33aae Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Thu, 26 Mar 2026 10:48:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9D=A3=E6=9F=A5=E6=A3=80=E6=9F=A5=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9E=E6=95=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/WebService/CNCECHSSEGetWebService.cs | 49 +++++++++++++++++--
 .../DCGL/ServerCheck/CheckRectifyEdit.aspx    |  5 +-
 .../DCGL/ServerCheck/CheckRectifyEdit.aspx.cs |  4 +-
 .../CheckRectifyEdit.aspx.designer.cs         |  4 +-
 .../APIItem/HSSE/DCGLCheckRectifyReject.cs    | 24 +++++++++
 SGGL/Model/Model.csproj                       |  1 +
 .../HSSE/DCGLCheckRectifyController.cs        | 34 +++++++++++++
 SGGL/WebAPI/WebAPI.csproj                     |  1 +
 8 files changed, 112 insertions(+), 10 deletions(-)
 create mode 100644 SGGL/Model/APIItem/HSSE/DCGLCheckRectifyReject.cs
 create mode 100644 SGGL/WebAPI/Controllers/HSSE/DCGLCheckRectifyController.cs

diff --git a/SGGL/BLL/WebService/CNCECHSSEGetWebService.cs b/SGGL/BLL/WebService/CNCECHSSEGetWebService.cs
index 4948157e..479ee8ee 100644
--- a/SGGL/BLL/WebService/CNCECHSSEGetWebService.cs
+++ b/SGGL/BLL/WebService/CNCECHSSEGetWebService.cs
@@ -1,10 +1,11 @@
-using System.Linq;
-using System.Timers;
-using System.Configuration;
-using System;
-using Newtonsoft.Json.Linq;
+using Model;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
 using System.Collections;
+using System.Configuration;
+using System.Linq;
+using System.Timers;
 
 namespace BLL
 {
@@ -103,5 +104,43 @@ namespace BLL
         }
         #endregion
 
+        #region 集团督查检查驳回整改
+
+        /// <summary>
+        /// 集团督查检查驳回整改
+        /// </summary>
+        /// <param name="data"></param>
+        /// <returns></returns>
+        public static ResponeData RejectRectify(DCGLCheckRectifyReject data)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var respone = new ResponeData();
+                var rectifItem = db.DCGL_Check_CheckRectifyItem.FirstOrDefault(x => x.CheckRectifyItemId == data.CheckRectifyItemId);
+                rectifItem.RealEndDate = null;
+                rectifItem.Verification = data.Reason;
+                db.SubmitChanges();
+                var rectify = db.DCGL_Check_CheckRectify.FirstOrDefault(x => x.CheckRectifyId == rectifItem.CheckRectifyId);
+                if (rectify != null)
+                {
+                    var getNoUpdateItem = db.DCGL_Check_CheckRectifyItem.FirstOrDefault(x => x.CheckRectifyId == rectifItem.CheckRectifyId && !x.RealEndDate.HasValue);
+                    if (getNoUpdateItem == null)
+                    {
+                        rectify.HandleState = "3";
+                    }
+                    else
+                    {
+                        rectify.HandleState = "2";
+                    }
+                    db.SubmitChanges();
+                }
+                return respone;
+            }
+        }
+
+
+        #endregion
+
+
     }
 }
diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx
index d4ac1623..67cfba11 100644
--- a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx
+++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx
@@ -125,7 +125,7 @@
                                 <f:TemplateField ColumnID="tfImageUrl2" MinWidth="120px" HeaderText="整改后" HeaderTextAlign="Center"
                                     TextAlign="Center">
                                     <ItemTemplate>
-                                        <asp:Label ID="tfImageUrl2" runat="server" Text='<%# ConvertImaUrlByImage(Eval("CheckRectifyItemId")) %>'></asp:Label>
+                                        <asp:Label ID="lbImageUrl2" runat="server" Text='<%# ConvertImaUrlByImage(Eval("CheckRectifyItemId")) %>'></asp:Label>
                                     </ItemTemplate>
                                 </f:TemplateField>
                                 <f:WindowField TextAlign="Center" Width="80px" WindowID="WindowAtt" HeaderText="上传整改" Text="上传照片"
@@ -172,6 +172,9 @@
                                         </f:TextArea>
                                     </Editor>
                                 </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="Verification" DataField="Verification" FieldType="String"
+                                    HeaderTextAlign="Center" TextAlign="Center" HeaderText="驳回整改原因">
+                                </f:RenderField>
                                 <f:RenderField Width="1px" ColumnID="CheckRectifyItemId" DataField="CheckRectifyItemId"
                                     FieldType="String" HeaderText="主键" Hidden="true" HeaderTextAlign="Center">
                                 </f:RenderField>
diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs
index 3075aa46..3444ae27 100644
--- a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs
@@ -168,7 +168,7 @@ namespace FineUIPro.Web.DCGL.ServerCheck
                 {
                     newCheckRectifyItem.RealEndDate = item.RealEndDate;
                     newCheckRectifyItem.OrderEndPerson = item.OrderEndPerson;
-                    //newCheckRectifyItem.Verification = item.Verification;
+                    newCheckRectifyItem.Verification = null;
                     BLL.DCGLCheckRectifyItemService.UpdateCheckRectifyItem(newCheckRectifyItem);
                 }
             }
@@ -323,7 +323,7 @@ namespace FineUIPro.Web.DCGL.ServerCheck
                         }
                         if (column.ColumnID == "tfImageUrl2")
                         {
-                            html = (row.FindControl("tfImageUrl2") as AspNet.Label).Text;
+                            html = (row.FindControl("lbImageUrl2") as AspNet.Label).Text;
                         }
                         sb.AppendFormat("<td>{0}</td>", html);
                     }
diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.designer.cs
index ef71075f..22b3618f 100644
--- a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.designer.cs
@@ -159,13 +159,13 @@ namespace FineUIPro.Web.DCGL.ServerCheck
         protected global::System.Web.UI.WebControls.Label lbImageUrl1;
 
         /// <summary>
-        /// tfImageUrl2 控件。
+        /// lbImageUrl2 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label tfImageUrl2;
+        protected global::System.Web.UI.WebControls.Label lbImageUrl2;
 
         /// <summary>
         /// txtOrderEndPerson 控件。
diff --git a/SGGL/Model/APIItem/HSSE/DCGLCheckRectifyReject.cs b/SGGL/Model/APIItem/HSSE/DCGLCheckRectifyReject.cs
new file mode 100644
index 00000000..16b3ee30
--- /dev/null
+++ b/SGGL/Model/APIItem/HSSE/DCGLCheckRectifyReject.cs
@@ -0,0 +1,24 @@
+using Model;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace Model
+{
+    /// <summary>
+    /// 督查检查驳回整改
+    /// </summary>
+    public class DCGLCheckRectifyReject
+    {
+        public string UnitId { get; set; }
+        public string ProjectId { get; set; }
+        public string CheckRectifyId { get; set; }
+        public string CheckRectifyItemId { get; set; }
+        public string NoticeItemId { get; set; }
+        /// <summary>
+        /// 驳回描述
+        /// </summary>
+        public string Reason { get; set; }
+
+    }
+}
diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj
index a2cebe6a..a496f077 100644
--- a/SGGL/Model/Model.csproj
+++ b/SGGL/Model/Model.csproj
@@ -105,6 +105,7 @@
     <Compile Include="APIItem\CQMS\SpotCheckItem.cs" />
     <Compile Include="APIItem\CQMS\ToDoModel.cs" />
     <Compile Include="APIItem\CQMS\TreeNode.cs" />
+    <Compile Include="APIItem\HSSE\DCGLCheckRectifyReject.cs" />
     <Compile Include="APIItem\HSSE\EmergencyProcessItem.cs" />
     <Compile Include="APIItem\HSSE\EmergencyTeamItem.cs" />
     <Compile Include="APIItem\HSSE\EquipmentQualityItem.cs" />
diff --git a/SGGL/WebAPI/Controllers/HSSE/DCGLCheckRectifyController.cs b/SGGL/WebAPI/Controllers/HSSE/DCGLCheckRectifyController.cs
new file mode 100644
index 00000000..9e30272a
--- /dev/null
+++ b/SGGL/WebAPI/Controllers/HSSE/DCGLCheckRectifyController.cs
@@ -0,0 +1,34 @@
+using BLL;
+using Model;
+using System;
+using System.Web.Http;
+
+namespace WebAPI.Controllers
+{
+    /// <summary>
+    /// 督查检查整改
+    /// </summary>
+    public class DCGLCheckRectifyController : ApiController
+    {
+        /// <summary>
+        /// 集团驳回督查检查整改
+        /// </summary>
+        /// <param name="data"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public Model.ResponeData RejectRectify([FromBody] DCGLCheckRectifyReject data)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData = CNCECHSSEGetWebService.RejectRectify(data);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+    }
+}
diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj
index d85f009f..6d9b6fb2 100644
--- a/SGGL/WebAPI/WebAPI.csproj
+++ b/SGGL/WebAPI/WebAPI.csproj
@@ -171,6 +171,7 @@
     <Compile Include="Controllers\FaceController.cs" />
     <Compile Include="Controllers\DoorServerController.cs" />
     <Compile Include="Controllers\HJGL\GetHJDataController.cs" />
+    <Compile Include="Controllers\HSSE\DCGLCheckRectifyController.cs" />
     <Compile Include="Controllers\HSSE\GeneralEquipmentQualityController.cs" />
     <Compile Include="Controllers\HSSE\HSSELogController.cs" />
     <Compile Include="Controllers\HSSE\MaterialInAndOutRecordController.cs" />