From 54ffb49e8ba828bb6654cab74fc1d6ba9b8b0c62 Mon Sep 17 00:00:00 2001
From: songwenxuan <1924103812@qq.com>
Date: Tue, 27 Feb 2024 10:46:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8=E7=8E=AF?=
 =?UTF-8?q?=E4=BF=9D=E6=A3=80=E6=9F=A5=E7=94=B3=E8=BE=A9=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=90=8E=E7=9A=84=E7=BC=96=E8=BE=91=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=AD=E6=A3=80=E6=9F=A5=E4=BA=BA=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/inspection/SafetyEnvironmentalController.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java
index f3bb3a37..8e0e7dc2 100644
--- a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java
+++ b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java
@@ -366,7 +366,7 @@ public class SafetyEnvironmentalController extends BaseController {
     @RequestMapping(value = "/edit")
     @RequiresPermissions("safetyenvironmental:edit")
     @ResponseBody
-    @DockAnnotation
+    @DockAnnotation(hasAnnex = true)
     public Object edit() throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();
         String errInfo = "success";
@@ -377,6 +377,7 @@ public class SafetyEnvironmentalController extends BaseController {
         pd.put("OPERATTIME", DateUtil.date2Str(new Date()));    //修改时间
         pd.put("CORPINFO_ID", "1".equals(Jurisdiction.getUSER_ID()) ? "" : Jurisdiction.getCORPINFO_ID());    //企业ID
         pd.put("ACTION_USER", Jurisdiction.getName());    //操作人
+        ArrayList<String> strings = new ArrayList<>();
         if (StringUtils.isNotBlank(pd.getString("CONFIRM_MESSAGE_SIGN"))) {
             MultipartFile file = BASE64DecodedMultipartFile.base64ToMultipart(pd.getString("CONFIRM_MESSAGE_SIGN"));
             String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
@@ -390,10 +391,12 @@ public class SafetyEnvironmentalController extends BaseController {
             String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
             Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
             pd.put("CONFIRM_MESSAGE_SIGN_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
+            strings.add(pd.getString("CONFIRM_MESSAGE_SIGN_ROUTE")+"@@"+fileName);
         }
         List<PageData> hiddenList = safetyenvironmentalService.edit(pd);
         pd.put("hiddenList", hiddenList);
         map.put("pd", pd);
+        map.put("sendPicturesList",JSON.toJSONString(strings));
         map.put("result", errInfo);
         map.put("dockData", JSON.toJSONString(pd));
         return map;