diff --git a/src/main/java/com/zcloud/controller/bus/HiddenExamineController.java b/src/main/java/com/zcloud/controller/bus/HiddenExamineController.java index 5ddfe881..43087095 100644 --- a/src/main/java/com/zcloud/controller/bus/HiddenExamineController.java +++ b/src/main/java/com/zcloud/controller/bus/HiddenExamineController.java @@ -429,6 +429,7 @@ public class HiddenExamineController extends BaseController { pd = this.getPageData(); PageData hiddenExa = hiddenexamineService.findById(pd); // 获取该隐患的未通过的隐患信息 PageData hidden = hiddenService.findById(hiddenExa); + ArrayList strings = new ArrayList<>(); if (Tools.isEmpty(hiddenExa)) { errInfo = "ERROR"; map.put("pd", pd); @@ -449,6 +450,7 @@ public class HiddenExamineController extends BaseController { String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile); hiddenExa.put("DISPOSAL_FILE", Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + strings.add(hiddenExa.getString("DISPOSAL_FILE")+"@@"+fileName); } hiddenExa.put("DISPOSAL_PLAN", pd.get("disposalPlan")); hiddenExa.put("STATE", "2"); @@ -516,6 +518,7 @@ public class HiddenExamineController extends BaseController { } map.put("pd", pd); map.put("result", errInfo); + map.put("sendPicturesList",JSON.toJSONString(strings)); map.put("dockData",JSON.toJSONString(pd)); return map; }