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 map = new HashMap(); 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 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 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;