1

2025-09-18 14:22:42 +08:00
parent cb92dcb730
commit 490a942589
14 changed files with 558 additions and 29 deletions
@@ -23,6 +23,12 @@ namespace FineUIPro.Web.DCGL.ServerCheck
            }
        }

+        /// <summary>
+        /// 集团服务器路径
+        /// </summary>
+        public string CNCECPath = BLL.Funs.CNCECPath;
+        //public string CNCECPath = "https://qhse.cncecoa.com/QHSE/";
+
        /// <summary>
        /// 定义集合
        /// </summary>
@@ -74,6 +80,27 @@ namespace FineUIPro.Web.DCGL.ServerCheck
            }
        }

+
+        /// <summary>
+        /// 获取整改前图片(放于Img中)
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        protected string ConvertImageUrlByImage(object id)
+        {
+            string url = string.Empty;
+            if (id != null)
+            {
+                var attachFile = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == id.ToString());
+
+                if (attachFile != null)
+                {
+                    url = BLL.UploadAttachmentService.ShowImage(CNCECPath, attachFile.AttachUrl);
+                }
+            }
+            return url;
+        }
+
        /// <summary>
        /// 保存按钮
        /// </summary>
@@ -103,12 +130,19 @@ namespace FineUIPro.Web.DCGL.ServerCheck
            jerqueSaveList();
            foreach (var item in CheckRectifyItems)
            {
+                var newCheckNoticeItem = BLL.DCGLCheckNoticeItemService.GetCheckNoticeItemByCheckNoticeItemId(item.NoticeItemId);
+                if (newCheckNoticeItem != null)
+                {
+                    newCheckNoticeItem.Situation = item.Situation;
+                    BLL.DCGLCheckNoticeItemService.UpdateCheckNoticeItem(newCheckNoticeItem);
+                }
+
                var newCheckRectifyItem = BLL.DCGLCheckRectifyItemService.GetCheckRectifyItemByCheckRectifyItemId(item.CheckRectifyItemId);
                if (newCheckRectifyItem != null)
                {
                    newCheckRectifyItem.RealEndDate = item.RealEndDate;
                    newCheckRectifyItem.OrderEndPerson = item.OrderEndPerson;
-                    newCheckRectifyItem.Verification = item.Verification;
+                    //newCheckRectifyItem.Verification = item.Verification;
                    BLL.DCGLCheckRectifyItemService.UpdateCheckRectifyItem(newCheckRectifyItem);
                }
            }
@@ -121,6 +155,7 @@ namespace FineUIPro.Web.DCGL.ServerCheck
            }
            if (type == BLL.Const.BtnSaveUp)
            {
+                //string code = CNCECHSSEGetWebService.UpReportDCGlCheck_CheckRectify(newCheckRectify.CheckRectifyId, this.CurrUser);
                string code = CNCECHSSEWebService.UpDCGlCheck_CheckRectify(newCheckRectify.CheckRectifyId, this.CurrUser);
                if (code == "1")
                {
@@ -154,7 +189,8 @@ namespace FineUIPro.Web.DCGL.ServerCheck
                {
                    item.OrderEndPerson = values.Value<string>("OrderEndPerson").ToString();
                    item.RealEndDate = Funs.GetNewDateTime(values.Value<string>("RealEndDate").ToString());
-                    item.Verification = values.Value<string>("Verification").ToString();
+                    //item.Verification = values.Value<string>("Verification").ToString();
+                    item.Situation = values.Value<string>("Situation").ToString();
                }
            }
        }