From dc86b0eb24c17fad52421bc03938afcf1209b14a Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 23 Jan 2024 11:30:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=9B=AD=E5=9C=B0=E3=80=81?=
 =?UTF-8?q?=E6=95=99=E8=82=B2=E5=9F=B9=E8=AE=AD=E5=8A=9F=E8=83=BD=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=90=8C=E6=AD=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/app/AppPromiseController.java      | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zcloud/controller/app/AppPromiseController.java b/src/main/java/com/zcloud/controller/app/AppPromiseController.java
index 70f6480b..30012cd2 100644
--- a/src/main/java/com/zcloud/controller/app/AppPromiseController.java
+++ b/src/main/java/com/zcloud/controller/app/AppPromiseController.java
@@ -1,5 +1,7 @@
 package com.zcloud.controller.app;
 
+import com.alibaba.fastjson.JSON;
+import com.zcloud.aspect.DockAnnotation;
 import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
@@ -16,10 +18,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 说明：手机承诺书表
@@ -61,6 +60,7 @@ public class AppPromiseController extends BaseController {
         }else {
             map.put("ISSIGN", 0);
         }
+        map.put("dockData", JSON.toJSONString(pd));
         map.put("result", errInfo);
         return map;
     }
@@ -98,12 +98,14 @@ public class AppPromiseController extends BaseController {
      */
     @RequestMapping(value="/editpeople")
     @ResponseBody
+    @DockAnnotation(hasAnnex = true)
     public Object editpeople(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{
         Map<String,Object> map = new HashMap<String,Object>();
         String errInfo = "success";
         PageData pd = new PageData();
         pd = this.getPageData();
         String ffile = DateUtil.getDays();
+        List<String> sendPicturesList = new ArrayList<>();
         if (file != null){
             String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
             if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
@@ -115,6 +117,7 @@ public class AppPromiseController 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("FILEPATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
+            sendPicturesList.add(pd.getString("FILEPATH") + "@@" + fileName);
             pd.put("SIGNTIME", pd.getString("SIGNTIME"));
             pd.put("ISSIGN",1);
             pd.put("ISREAD","0");
@@ -141,6 +144,8 @@ public class AppPromiseController extends BaseController {
                 }
             }
         }
+        map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
+        map.put("dockData", JSON.toJSONString(pd));
         map.put("result", errInfo);
         return map;
     }
@@ -213,6 +218,7 @@ public class AppPromiseController extends BaseController {
      */
     @RequestMapping(value="/editIsRead")
     @ResponseBody
+    @DockAnnotation
     public Object editIsRead() throws Exception{
         Map<String,Object> map = new HashMap<String,Object>();
         String errInfo = "success";
@@ -221,6 +227,7 @@ public class AppPromiseController extends BaseController {
         pd.put("ISREAD","1");
         corpPromisePeopleService.editIsRead(pd); //阅读状态修改为已阅
         map.put("result", errInfo);
+        map.put("dockData", JSON.toJSONString(pd));
         return map;
     }
 }