From bb5b3678868930c847d33ebff69d10f95a967a12 Mon Sep 17 00:00:00 2001
From: songwenxuan <1924103812@qq.com>
Date: Tue, 27 Feb 2024 11:58:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DApp=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E7=8E=AF=E4=BF=9D=E6=A3=80=E6=9F=A5=E7=94=B3=E8=BE=A9=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E9=80=9A=E8=BF=87=E5=90=8E=E7=9A=84=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=B8=AD=E6=A3=80=E6=9F=A5=E4=BA=BA=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=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

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

diff --git a/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalController.java b/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalController.java
index 32a4eb56..9ac67825 100644
--- a/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalController.java
+++ b/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalController.java
@@ -167,7 +167,7 @@ public class AppSafetyEnvironmentalController extends BaseController {
 	 */
 	@RequestMapping(value="/edit")
 	@ResponseBody
-	@DockAnnotation
+	@DockAnnotation(hasAnnex = true)
 	public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
@@ -178,6 +178,7 @@ public class AppSafetyEnvironmentalController extends BaseController {
 		pd.put("OPERATTIME", DateUtil.date2Str(new Date()));	//修改时间
 		pd.put("ACTION_USER", pd.getString("ACTION_USER"));	//操作人
 		String ffile = DateUtil.getDays();
+		ArrayList<String> strings = new ArrayList<>();
 		if (file != null && StringUtils.isNotBlank(pd.getString("INSPECTION_USER_OPINION"))){
 			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)) {
@@ -191,10 +192,12 @@ public class AppSafetyEnvironmentalController extends BaseController {
 			pd.put("CONFIRM_MESSAGE_SIGN_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
 			pd.put("CONFIRM_MESSAGE",pd.getString("INSPECTION_USER_OPINION"));
 			pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date()));
+			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;