From 8b0b178d888872f4cacfb31ddae4e24fcfc46fe7 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Mon, 15 Dec 2025 15:01:07 +0800
Subject: [PATCH] 1

---
 .../DCGL/ServerCheck/CheckRectifyEdit.aspx    |  8 ++++-
 .../DCGL/ServerCheck/CheckRectifyEdit.aspx.cs | 32 +++++++++++++++++--
 .../CheckRectifyEdit.aspx.designer.cs         |  9 ++++++
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/SUBQHSE/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx b/SUBQHSE/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx
index 6d4749b..d4ac162 100644
--- a/SUBQHSE/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx
+++ b/SUBQHSE/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx
@@ -122,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>
diff --git a/SUBQHSE/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs b/SUBQHSE/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs
index 1e80daa..3075aa4 100644
--- a/SUBQHSE/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs
@@ -105,6 +105,27 @@ namespace FineUIPro.Web.DCGL.ServerCheck
             }
             return url;
         }
+        /// <summary>
+        /// 获取整改后图片(放于Img中)
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        protected string ConvertImaUrlByImage(object id)
+        {
+            string url = string.Empty;
+            string httpUrl = string.Empty;
+            var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault();
+            if (sysSet6 != null)
+            {
+                httpUrl = sysSet6.SetValue;
+            }
+            var attachFile = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == id.ToString());
+            if (attachFile != null)
+            {
+                url = BLL.UploadAttachmentService.ShowImage(httpUrl, attachFile.AttachUrl);
+            }
+            return url;
+        }
 
         /// <summary>
         /// 保存按钮
@@ -269,9 +290,12 @@ namespace FineUIPro.Web.DCGL.ServerCheck
             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")
+                if (column.ColumnID != "ckbIsSelected" && column.ColumnID != "Punish" && column.ColumnID != "Del" && column.ColumnID != "CheckRectifyItemId" && column.ColumnID != "WindowAtt1")
                 {
                     sb.AppendFormat("<td>{0}</td>", column.HeaderText);
                 }
@@ -282,7 +306,7 @@ namespace FineUIPro.Web.DCGL.ServerCheck
                 sb.Append("<tr>");
                 foreach (GridColumn column in grid.Columns)
                 {
-                    if (column.ColumnID != "ckbIsSelected" && column.ColumnID != "Punish" && column.ColumnID != "Del" && column.ColumnID != "CheckRectifyItemId")
+                    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")
@@ -297,6 +321,10 @@ namespace FineUIPro.Web.DCGL.ServerCheck
                         {
                             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);
                     }
                 }
diff --git a/SUBQHSE/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.designer.cs
index f1ac82f..ef71075 100644
--- a/SUBQHSE/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.designer.cs
@@ -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>