From 465c189c6693b99d93da7460efadf6d70d621987 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Mon, 15 Dec 2025 16:25:55 +0800
Subject: [PATCH] 1

---
 ...-xiaj（View_DCGL_CheckRectifyListFromSUB）.sql |  56 ++++++++
 .../DCGL/ServerCheck/CheckNotice.aspx.cs      |  14 +-
 .../DCGL/ServerCheck/CheckRectify.aspx.cs     |  17 ++-
 .../DCGL/ServerCheck/CheckRectifyEdit.aspx    |  49 +++++--
 .../DCGL/ServerCheck/CheckRectifyEdit.aspx.cs | 121 +++++++++++++++++-
 .../CheckRectifyEdit.aspx.designer.cs         |  28 +++-
 6 files changed, 255 insertions(+), 30 deletions(-)
 create mode 100644 DataBase/版本日志/SGGLDB_V2025-12-12-xiaj（View_DCGL_CheckRectifyListFromSUB）.sql

diff --git a/DataBase/版本日志/SGGLDB_V2025-12-12-xiaj（View_DCGL_CheckRectifyListFromSUB）.sql b/DataBase/版本日志/SGGLDB_V2025-12-12-xiaj（View_DCGL_CheckRectifyListFromSUB）.sql
new file mode 100644
index 00000000..26399a2a
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2025-12-12-xiaj（View_DCGL_CheckRectifyListFromSUB）.sql
@@ -0,0 +1,56 @@
+
+
+ALTER VIEW [dbo].[View_DCGL_CheckRectifyListFromSUB]
+AS
+/*�ӹ�˾�������ĵ�������ͼ*/
+SELECT CheckRectifyItem.CheckRectifyItemId
+		,CheckRectifyItem.CheckRectifyId
+		,CheckRectifyItem.NoticeItemId
+		,CheckRectifyItem.ConfirmMan
+		,CheckRectifyItem.ConfirmManName
+		,CheckRectifyItem.ConfirmDate
+		,CheckRectifyItem.OrderEndDate
+		,CheckRectifyItem.OrderEndPerson
+		,CheckRectifyItem.RealEndDate
+		,CheckRectifyItem.Verification
+		,CheckRectify.CheckRectifyCode
+		,CheckRectify.ProjectId
+		,CheckRectify.UnitId
+		,CheckRectify.CheckDate
+		,CheckRectify.IssueMan
+		,CheckRectify.IssueDate
+		,CheckRectify.HandleState
+		,NoticeItem.ProblemTypes AS ProblemTypes
+		,NoticeItem.RiskLevel AS RiskLevel
+		,NoticeItem.SortIndex AS SortIndex
+		,NoticeItem.Situation AS Situation
+		,'' AS WorkType
+		,'' AS DangerPoint
+      ,'���������⣩����:'+NoticeItem.Describe+';���ݱ�׼:'+NoticeItem.Standards+';����:'+NoticeItem.Advice AS RiskExists
+		,'' AS IsProject
+		,'' AS CheckMan
+		,'' AS SubjectUnitMan
+		--,Table5Item.SortIndex
+		--,Table5Item.WorkType
+		--,Table5Item.DangerPoint
+		--,Table5Item.RiskExists
+		--,Table5Item.IsProject
+		--,Table5Item.CheckMan
+		--,Table5Item.SubjectUnitMan
+		,AttachFile.AttachFileId
+		,AttachFile.ToKeyId
+		,AttachFile.AttachSource
+		,AttachFile.AttachUrl
+		,AttachFile2.AttachFileId AS AttachFileId2
+		,AttachFile2.ToKeyId AS ToKeyId2
+		,AttachFile2.AttachSource AS AttachSource2
+		,AttachFile2.AttachUrl AS AttachUrl2
+FROM dbo.DCGL_Check_CheckRectifyItem AS CheckRectifyItem
+LEFT JOIN dbo.DCGL_Check_CheckRectify AS CheckRectify ON CheckRectifyItem.CheckRectifyid=CheckRectify.CheckRectifyId
+--LEFT JOIN dbo.Check_CheckInfo_Table5Item as Table5Item on CheckRectifyItem.Table5ItemId=Table5Item.ID
+LEFT JOIN DCGL_Check_CheckInfo_TableNoticeItem AS NoticeItem ON CheckRectifyItem.NoticeItemId=NoticeItem.ID
+LEFT JOIN dbo.AttachFile  AS AttachFile on AttachFile.ToKeyId =CheckRectifyItem.NoticeItemId
+LEFT JOIN dbo.AttachFile  AS AttachFile2 on AttachFile2.ToKeyId =CheckRectifyItem.CheckRectifyItemId
+GO
+
+
diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckNotice.aspx.cs b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckNotice.aspx.cs
index 1aaa265b..a33c8ad1 100644
--- a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckNotice.aspx.cs
+++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckNotice.aspx.cs
@@ -6,6 +6,8 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Windows.Forms;
+using System.Xml.Linq;
 
 namespace FineUIPro.Web.DCGL.ServerCheck
 {
@@ -38,6 +40,7 @@ namespace FineUIPro.Web.DCGL.ServerCheck
         {
             if (!IsPostBack)
             {
+                getDCGLCheckInfo();
                 ////权限按钮方法                
                 this.InitTreeMenu();
                 this.CheckInfoId = string.Empty;
@@ -348,6 +351,16 @@ namespace FineUIPro.Web.DCGL.ServerCheck
         /// <param name="sender"></param>
         /// <param name="e"></param>
         protected void btnGet_Click(object sender, EventArgs e)
+        {
+            getDCGLCheckInfo();
+        }
+
+        /// <summary>
+        /// 从集团获取
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void getDCGLCheckInfo()
         {
             var returnValue = getDCGLCheckInfo_CheckTeam();
             // var returnValue= CNCECHSSEGetWebService.getCheck_CheckInfo_Table8Item();
@@ -362,7 +375,6 @@ namespace FineUIPro.Web.DCGL.ServerCheck
                 Alert.ShowInTop(returnValue.message, MessageBoxIcon.Success);
             }
         }
-
         #region 获取
         /// <summary>
         ///  获取
diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.cs b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.cs
index aa25e49b..39b929e8 100644
--- a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.cs
+++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.cs
@@ -18,6 +18,7 @@ namespace FineUIPro.Web.DCGL.ServerCheck
         {
             if (!IsPostBack)
             {
+                getCheck();
                 proType = Request.Params["proType"] ?? string.Empty;
                 this.GetButtonPower();
                 //btnNew.OnClientClick = Window1.GetShowReference("CheckRectifyEdit.aspx") + "return false;";              
@@ -38,9 +39,10 @@ namespace FineUIPro.Web.DCGL.ServerCheck
             sb.Append("FROM dbo.DCGL_Check_CheckRectify AS S LEFT JOIN dbo.Base_Unit AS U ON U.UnitId = S.UnitId ");
             sb.Append("     LEFT JOIN (SELECT COUNT(*) AS TotalCount, CheckRectifyId FROM dbo.DCGL_Check_CheckRectifyItem GROUP BY CheckRectifyId) AS TotalCount ON S.CheckRectifyId=TotalCount.CheckRectifyId ");
             sb.Append("     LEFT JOIN (SELECT COUNT(*) AS CompleteCount, CheckRectifyId FROM dbo.DCGL_Check_CheckRectifyItem WHERE RealEndDate IS NOT NULL GROUP BY CheckRectifyId) AS CompleteCount ON S.CheckRectifyId=CompleteCount.CheckRectifyId ");
-            if (!string.IsNullOrWhiteSpace(proType) && proType == "1")
+            sb.Append("WHERE 1=1 ");
+            if (!string.IsNullOrWhiteSpace(this.CurrUser.LoginProjectId) && !string.IsNullOrWhiteSpace(proType) && proType == "1")
             {//只查询本项目检查数据
-                sb.Append($"WHERE S.ProjectId='{this.CurrUser.LoginProjectId}' ");
+                sb.Append($"And S.ProjectId='{this.CurrUser.LoginProjectId}' ");
             }
             sb.Append("ORDER BY HandleState");
             SqlParameter[] parameter = new SqlParameter[] { };
@@ -135,7 +137,7 @@ namespace FineUIPro.Web.DCGL.ServerCheck
                 return;
             }
             string CheckRectifyId = Grid1.SelectedRowID;
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CheckRectifyEdit.aspx?CheckRectifyId={0}", CheckRectifyId, "编辑 - ")));
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CheckRectifyEdit.aspx?CheckRectifyId={0}&proType={1}", CheckRectifyId, proType, "编辑 - ")));
         }
         #endregion
 
@@ -378,6 +380,14 @@ namespace FineUIPro.Web.DCGL.ServerCheck
         /// <param name="sender"></param>
         /// <param name="e"></param>
         protected void btnGet_Click(object sender, EventArgs e)
+        {
+            getCheck();
+        }
+
+        /// <summary>
+        /// 从集团获取整改单
+        /// </summary>
+        protected void getCheck()
         {
             var returnValue = getCheck_CheckRectifyListToSUB();
             if (returnValue.code == 1)
@@ -391,7 +401,6 @@ namespace FineUIPro.Web.DCGL.ServerCheck
             }
         }
 
-
         #region 获取
 
         /// <summary>
diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx
index d87ec2cf..d4ac1623 100644
--- a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx
+++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx
@@ -7,13 +7,14 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>隐患整改单</title>
     <link href="../../res/css/viewer.min.css" rel="stylesheet" />
-    <script src="../../res/js/jquery-3.7.1.min.js" type="text/javascript"></script>
+    <script src="../../res/js/jquery-3.4.1.min.js" type="text/javascript"></script>
     <script src="../../res/js/viewer.min.js" type="text/javascript"></script>
     <style type="text/css">
         .f-grid-row .f-grid-cell-inner {
             white-space: normal;
             word-break: break-all;
         }
+
         .imgPreview {
             display: none;
             top: 0;
@@ -82,23 +83,35 @@
                 <f:FormRow>
                     <Items>
                         <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" runat="server"
-                            BoxFlex="1" DataKeyNames="CheckRectifyItemId" AllowCellEditing="true" Height="620px"
+                            BoxFlex="1" DataKeyNames="CheckRectifyItemId" AllowCellEditing="true" Height="720px"
                             ClicksToEdit="1" DataIDField="CheckRectifyItemId" EnableColumnLines="true">
                             <Columns>
-                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="45px" HeaderTextAlign="Center" TextAlign="Center" />
-                                <f:RenderField Width="100px" ColumnID="WorkType" DataField="WorkType" SortField="WorkType"
+                                <f:TemplateField ColumnID="tfPageIndex" MinWidth="50px" HeaderText="序号" HeaderTextAlign="Center"
+                                    TextAlign="Center" EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <%--<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="45px" HeaderTextAlign="Center" TextAlign="Center" />--%>
+                               <%-- <f:RenderField Width="100px" ColumnID="WorkType" DataField="WorkType" SortField="WorkType"
                                     FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="作业类别" Hidden="true">
                                 </f:RenderField>
                                 <f:TemplateField Width="250px" HeaderText="隐患源点" HeaderTextAlign="Center" TextAlign="Left" Hidden="true">
                                     <ItemTemplate>
                                         <asp:Label ID="Label15" runat="server" Text='<%# Bind("DangerPoint") %>' ToolTip='<%#Bind("DangerPoint") %>'></asp:Label>
                                     </ItemTemplate>
-                                </f:TemplateField>
-                                <f:TemplateField Width="150px" HeaderText="存在风险" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
+                                </f:TemplateField>--%>
+                                <f:TemplateField ColumnID="tfRiskExists" Width="280px" HeaderText="存在风险" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
                                     <ItemTemplate>
-                                        <asp:Label ID="Label4" runat="server" Text='<%# Bind("RiskExists") %>' ToolTip='<%#Bind("RiskExists") %>'></asp:Label>
+                                        <asp:Label ID="lbRiskExists" runat="server" Text='<%# Bind("RiskExists") %>' ToolTip='<%#Bind("RiskExists") %>'></asp:Label>
                                     </ItemTemplate>
                                 </f:TemplateField>
+                               <%-- <f:RenderField MinWidth="300px" ColumnID="RiskExists" DataField="RiskExists" FieldType="String"
+                                    HeaderTextAlign="Center" TextAlign="Left" HeaderText="存在风险">
+                                </f:RenderField>--%>
+                                <f:RenderField Width="80px" ColumnID="RiskLevel" DataField="RiskLevel" FieldType="String"
+                                    HeaderTextAlign="Center" TextAlign="Center" HeaderText="等级">
+                                </f:RenderField>
                                 <f:TemplateField ColumnID="tfImageUrl1" MinWidth="120px" HeaderText="整改前" HeaderTextAlign="Center"
                                     TextAlign="Center">
                                     <ItemTemplate>
@@ -109,7 +122,13 @@
                                     ToolTip="相关照片附件" DataIFrameUrlFields="NoticeItemId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/Check&type=-1"
                                     Title="相关照片" ColumnID="WindowAtt">
                                 </f:WindowField>--%>
-                                <f:WindowField TextAlign="Center" Width="80px" WindowID="WindowAtt" HeaderText="整改后" Text="相关照片"
+                                <f:TemplateField ColumnID="tfImageUrl2" MinWidth="120px" HeaderText="整改后" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                    <ItemTemplate>
+                                        <asp:Label ID="tfImageUrl2" runat="server" Text='<%# ConvertImaUrlByImage(Eval("CheckRectifyItemId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:WindowField TextAlign="Center" Width="80px" WindowID="WindowAtt" HeaderText="上传整改" Text="上传照片"
                                     ToolTip="相关照片附件" DataIFrameUrlFields="CheckRectifyItemId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/Check&menuId=2E4A3E58-44B7-41B0-BFE3-634DF29AAE27"
                                     Title="相关照片" ColumnID="WindowAtt1">
                                 </f:WindowField>
@@ -139,18 +158,18 @@
                                         </f:DatePicker>
                                     </Editor>
                                 </f:RenderField>
-                               <%-- <f:RenderField ColumnID="Verification" DataField="Verification" Width="100px" HeaderToolTip="企业管理部门验证人"
+                                <%-- <f:RenderField ColumnID="Verification" DataField="Verification" Width="100px" HeaderToolTip="企业管理部门验证人"
                                     FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="验证人">
                                     <Editor>
                                         <f:TextBox ID="txtVerification" Text='<%# Eval("Verification")%>' MaxLength="50" runat="server">
                                         </f:TextBox>
                                     </Editor>
                                 </f:RenderField>--%>
-                                <f:RenderField ColumnID="Situation" DataField="Situation" Width="220px" HeaderToolTip="整改情况"
+                                <f:RenderField ColumnID="Situation" DataField="Situation" Width="260px" HeaderToolTip="整改情况"
                                     FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="整改情况">
                                     <Editor>
-                                        <f:TextBox ID="txtSituation" Text='<%# Eval("Situation")%>' MaxLength="500" runat="server">
-                                        </f:TextBox>
+                                        <f:TextArea ID="txtSituation" Text='<%# Eval("Situation")%>' MaxLength="500" Height="150" runat="server">
+                                        </f:TextArea>
                                     </Editor>
                                 </f:RenderField>
                                 <f:RenderField Width="1px" ColumnID="CheckRectifyItemId" DataField="CheckRectifyItemId"
@@ -164,6 +183,9 @@
             <Toolbars>
                 <f:Toolbar ID="Toolbar1" Position="Top" ToolbarAlign="Right" runat="server">
                     <Items>
+                        <f:Button ID="btnOutExcel" OnClick="btnOutExcel_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
+                            EnableAjax="false" DisableControlBeforePostBack="false">
+                        </f:Button>
                         <f:Button ID="btnSave" Icon="SystemSave" runat="server" Hidden="true" Text="保存" ValidateForms="SimpleForm1"
                             OnClick="btnSave_Click">
                         </f:Button>
@@ -185,7 +207,7 @@
         <img src="#" alt="" id="imgPreview" />
     </div>
     <script type="text/javascript">       
-        
+
         var imgID = '<%=Grid1.ClientID %>';
         function showImg() {
             var $wrap = $("#" + imgID)
@@ -218,6 +240,5 @@
             showImg();
         })
     </script>
-    <script src="../../res/js/hook.js" type="text/javascript"></script>
 </body>
 </html>
diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs
index 1693560a..92c0d33f 100644
--- a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs
@@ -1,13 +1,16 @@
-using BLL;
-using Newtonsoft.Json.Linq;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
+using BLL;
+using Newtonsoft.Json.Linq;
+using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.DCGL.ServerCheck
 {
     public partial class CheckRectifyEdit : PageBase
     {
+        private static string proType;
         /// <summary>
         /// 主键
         /// </summary>
@@ -40,6 +43,7 @@ namespace FineUIPro.Web.DCGL.ServerCheck
             {
                 this.GetButtonPower();
                 this.CheckRectifyId = Request.Params["CheckRectifyId"];
+                proType = Request.Params["proType"] ?? string.Empty;
                 if (!string.IsNullOrEmpty(this.CheckRectifyId))
                 {
                     var rectify = Funs.DB.DCGL_Check_CheckRectify.FirstOrDefault(x => x.CheckRectifyId == this.CheckRectifyId);
@@ -72,8 +76,8 @@ namespace FineUIPro.Web.DCGL.ServerCheck
                         Grid1.DataBind();
                         //if (CheckRectifyItems.FirstOrDefault(x => x.DangerPoint.Length > 1) == null)
                         //{
-                        this.Grid1.Columns[1].Hidden = true;
-                        this.Grid1.Columns[2].Hidden = true;
+                        //this.Grid1.Columns[1].Hidden = true;
+                        //this.Grid1.Columns[2].Hidden = true;
                         //}
                     }
                 }
@@ -95,11 +99,29 @@ namespace FineUIPro.Web.DCGL.ServerCheck
 
                 if (attachFile != null)
                 {
+                    CNCECPath = !string.IsNullOrWhiteSpace(CNCECPath) ? CNCECPath : "https://qhse.cncecoa.com/QHSE/";
                     url = BLL.UploadAttachmentService.ShowImage(CNCECPath, attachFile.AttachUrl);
                 }
             }
             return url;
         }
+        /// <summary>
+        /// 获取整改后图片(放于Img中)
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        protected string ConvertImaUrlByImage(object id)
+        {
+            string url = string.Empty;
+            string httpUrl = string.Empty;
+            httpUrl = Funs.SGGLUrl;
+            var attachFile = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == id.ToString());
+            if (attachFile != null)
+            {
+                url = BLL.UploadAttachmentService.ShowImage(httpUrl, attachFile.AttachUrl);
+            }
+            return url;
+        }
 
         /// <summary>
         /// 保存按钮
@@ -207,7 +229,14 @@ namespace FineUIPro.Web.DCGL.ServerCheck
                 if (buttonList.Contains(BLL.Const.BtnSave))
                 {
                     this.btnSave.Hidden = false;
-                    this.btnSaveUp.Hidden = false;
+                    if (proType == "1")
+                    {
+                        this.btnSaveUp.Hidden = true;
+                    }
+                    else
+                    {
+                        this.btnSaveUp.Hidden = false;
+                    }
                 }
             }
         }
@@ -224,5 +253,85 @@ namespace FineUIPro.Web.DCGL.ServerCheck
             PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
         }
         #endregion
+
+        #region 导出
+
+        /// <summary>
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOutExcel_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            var unitProjectName = $"{this.lbUnitName.Text}{this.lbProjectName.Text}";
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode(unitProjectName + "隐患问题表" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = System.Text.Encoding.UTF8;
+            this.Grid1.PageSize = this.Grid1.RecordCount;
+            //this.BindGrid();
+            Response.Write(GetGridTableHtml(Grid1));
+            Response.End();
+        }
+
+        /// <summary>
+        /// 导出方法
+        /// </summary>
+        /// <param name="grid"></param>
+        /// <returns></returns>
+        private string GetGridTableHtml(Grid grid)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
+            sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
+            sb.Append("<tr>");
+            sb.AppendFormat("<td colspan=\"11\" style=\"line-height:50px;text-align:center;vertical-align:middle;\">集团督查检查隐患列表</td>", "");
+            sb.Append("</tr>");
+            sb.Append("<tr>");
+            foreach (GridColumn column in grid.Columns)
+            {
+                if (column.ColumnID != "ckbIsSelected" && column.ColumnID != "Punish" && column.ColumnID != "Del" && column.ColumnID != "CheckRectifyItemId" && column.ColumnID != "WindowAtt1")
+                {
+                    sb.AppendFormat("<td>{0}</td>", column.HeaderText);
+                }
+            }
+            sb.Append("</tr>");
+            foreach (GridRow row in grid.Rows)
+            {
+                sb.Append("<tr>");
+                foreach (GridColumn column in grid.Columns)
+                {
+                    if (column.ColumnID != "ckbIsSelected" && column.ColumnID != "Punish" && column.ColumnID != "Del" && column.ColumnID != "CheckRectifyItemId" && column.ColumnID != "WindowAtt1")
+                    {
+                        string html = row.Values[column.ColumnIndex].ToString();
+                        if (column.ColumnID == "tfPageIndex")
+                        {
+                            html = (row.FindControl("lblPageIndex") as AspNet.Label).Text;
+                        }
+                        if (column.ColumnID == "tfRiskExists")
+                        {
+                            html = (row.FindControl("lbRiskExists") as AspNet.Label).Text;
+                        }
+                        if (column.ColumnID == "tfImageUrl1")
+                        {
+                            html = (row.FindControl("lbImageUrl1") as AspNet.Label).Text;
+                        }
+                        if (column.ColumnID == "tfImageUrl2")
+                        {
+                            html = (row.FindControl("tfImageUrl2") as AspNet.Label).Text;
+                        }
+                        sb.AppendFormat("<td>{0}</td>", html);
+                    }
+                }
+                sb.Append("</tr>");
+            }
+            sb.Append("</table>");
+
+            return sb.ToString();
+        }
+
+
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.designer.cs
index d4dbed10..ef71075f 100644
--- a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.designer.cs
@@ -132,22 +132,22 @@ namespace FineUIPro.Web.DCGL.ServerCheck
         protected global::FineUIPro.Grid Grid1;
 
         /// <summary>
-        /// Label15 控件。
+        /// lblPageIndex 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label15;
+        protected global::System.Web.UI.WebControls.Label lblPageIndex;
 
         /// <summary>
-        /// Label4 控件。
+        /// lbRiskExists 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label4;
+        protected global::System.Web.UI.WebControls.Label lbRiskExists;
 
         /// <summary>
         /// lbImageUrl1 控件。
@@ -158,6 +158,15 @@ namespace FineUIPro.Web.DCGL.ServerCheck
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lbImageUrl1;
 
+        /// <summary>
+        /// tfImageUrl2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label tfImageUrl2;
+
         /// <summary>
         /// txtOrderEndPerson 控件。
         /// </summary>
@@ -183,7 +192,7 @@ namespace FineUIPro.Web.DCGL.ServerCheck
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtSituation;
+        protected global::FineUIPro.TextArea txtSituation;
 
         /// <summary>
         /// Toolbar1 控件。
@@ -194,6 +203,15 @@ namespace FineUIPro.Web.DCGL.ServerCheck
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
 
+        /// <summary>
+        /// btnOutExcel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOutExcel;
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>