From 26dbfb49cee2eebef753af2c9f1567138131b235 Mon Sep 17 00:00:00 2001
From: songwenxuan <1924103812@qq.com>
Date: Thu, 28 Dec 2023 13:45:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E4=BB=A3=E7=A0=81=E6=96=B0?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zcloud/controller/bus/HiddenController.java   | 7 +++++++
 .../inspection/impl/SafetyEnvironmentalServiceImpl.java    | 1 +
 2 files changed, 8 insertions(+)

diff --git a/src/main/java/com/zcloud/controller/bus/HiddenController.java b/src/main/java/com/zcloud/controller/bus/HiddenController.java
index f711abc0..f30065e5 100644
--- a/src/main/java/com/zcloud/controller/bus/HiddenController.java
+++ b/src/main/java/com/zcloud/controller/bus/HiddenController.java
@@ -2615,6 +2615,7 @@ public class HiddenController extends BaseController {
      */
     @RequestMapping(value = "/applycheck")
     @ResponseBody
+    @DockAnnotation
     public Object applycheck(@RequestParam(value = "FFILE", required = false) MultipartFile file,
                              @RequestParam(value = "FFILEPDF", required = false) MultipartFile filepdf
     ) throws Exception {
@@ -2663,6 +2664,7 @@ public class HiddenController extends BaseController {
         saftList.put("STATE", '0');
         List<PageData> saftlist = departmentService.saftpersonlist(saftList); //查询股份公司安监部负责人
         if (saftlist.size() > 0) {
+            ArrayList<PageData> mesList = new ArrayList<>();
             for (PageData arr : saftlist) {
                 PageData userpd = new PageData();
                 userpd.put("USER_ID", arr.getString("IN_CHARGE"));
@@ -2675,12 +2677,15 @@ public class HiddenController extends BaseController {
                     mes.put("SYNOPSIS", "友情提示：有一条较大隐患需要验收");    // 站内信标题
                     mes.put("RECEIVER_ID", user.getString("USER_ID"));    // 接收人员ID
                     mes.put("CONTENT", "有一条较大隐患数据在“安委会办公室验收”，等您验收");// 站内信内容
+                    mesList.add(mes);
                     noticeRegulatoryService.sendMessage(mes);
                 }
             }
+            pd.put("mesList",JSON.toJSONString(mesList));
         }
 
         map.put("result", errInfo);
+        map.put("dockData",JSON.toJSONString(pd));
         return map;
     }
 
@@ -2868,6 +2873,7 @@ public class HiddenController extends BaseController {
         }
         map.put("result", errInfo);
         map.put("pd", pd);
+        map.put("dockData","对接接口");
         return map;
     }
 
@@ -2965,6 +2971,7 @@ public class HiddenController extends BaseController {
         }
         map.put("check", pd);
         map.put("result", errInfo);
+        map.put("dockData",JSON.toJSONString(pd));
         return map;
     }
 
diff --git a/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java b/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java
index 7a9c08ce..78b74678 100644
--- a/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java
+++ b/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java
@@ -232,6 +232,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
 	public void edieditsttust(PageData pd)throws Exception{
 		safetyenvironmentalMapper.edieditsttust(pd); //执行考评方法时，将检查状态改成已归档，因为bug6535提出，要是隐患考评完毕，状态应该是8已归档
 	}
+
 	/**修改
 	 * @param pd
 	 * @throws Exception