diff --git a/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java b/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java index e3f830a0..b4b2533c 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java @@ -455,18 +455,18 @@ public class AppGFElectricityController extends BaseController { String signertime = ""; String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + ArrayList pictureList = new ArrayList(); for (int i = 0; i < SIGNTIME.length; i++) { - ArrayList pictureList = new ArrayList(); signertime = SIGNTIME[i]; fileList.add(request.getFile("file"+i)); MultipartFile[] fileArr = new MultipartFile[fileList.size()]; saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("ELECTRICITY_ID"), pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"), pd.getString("ACCEPT_DEPARTMENT_ID"),pictureList); - map.put("sendPicturesList", JSON.toJSONString(pictureList)); fileList.clear(); } - pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); GFelectricityService.edit(pd2); map.put("dockDatapd2", JSON.toJSONString(pd2)); diff --git a/src/main/java/com/zcloud/controller/gf/AppGFHotworkController.java b/src/main/java/com/zcloud/controller/gf/AppGFHotworkController.java index 58657fa9..62d7e2aa 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFHotworkController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFHotworkController.java @@ -2,6 +2,7 @@ package com.zcloud.controller.gf; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.dto.TenCorpConst; import com.zcloud.dto.TenCorpDto; @@ -84,6 +85,7 @@ public class AppGFHotworkController extends BaseController { @RequestMapping(value="/add") @ResponseBody @Transactional + @DockAnnotation(isAdd = true) public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -105,6 +107,7 @@ public class AppGFHotworkController extends BaseController { pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 + map.put("dockData", JSON.toJSONString(pd)); GFhotworkService.save(pd); if(pd.get("APPLY_STATUS").equals("1")) { @@ -114,6 +117,7 @@ public class AppGFHotworkController extends BaseController { log.put("HOTWORK_ID", pd.get("HOTWORK_ID")); log.put("CREATOR",pd.get("ACTION_USER")); log.put("CREATTIME", DateUtil.date2Str(new Date())); + map.put("dockDataLog", JSON.toJSONString(log)); GFhotworkLogService.save(log); // 发短信 @@ -183,11 +187,13 @@ public class AppGFHotworkController extends BaseController { */ @RequestMapping(value="/delete") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + map.put("dockData", JSON.toJSONString(pd)); GFhotworkService.delete(pd); map.put("result", errInfo); //返回结果 return map; @@ -198,11 +204,13 @@ public class AppGFHotworkController extends BaseController { @RequestMapping(value="/edit") @ResponseBody @Transactional + @DockAnnotation public Object edit() throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + map.put("dockData", JSON.toJSONString(pd)); GFhotworkService.edit(pd); if(pd.get("APPLY_STATUS").equals("1")) { PageData log = new PageData(); @@ -211,6 +219,7 @@ public class AppGFHotworkController extends BaseController { log.put("HOTWORK_ID", pd.get("HOTWORK_ID")); log.put("CREATOR",pd.get("ACTION_USER")); log.put("CREATTIME", DateUtil.date2Str(new Date())); + map.put("dockDataLog", JSON.toJSONString(log)); GFhotworkLogService.save(log); @@ -256,6 +265,7 @@ public class AppGFHotworkController extends BaseController { map.put("result", errInfo); return map; } + /**修改 * @param * @throws Exception @@ -263,6 +273,7 @@ public class AppGFHotworkController extends BaseController { @RequestMapping(value="/editGuardian") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editGuardian( @RequestParam(value="FFILE",required=false) MultipartFile[] files ) throws Exception{ @@ -275,22 +286,27 @@ public class AppGFHotworkController extends BaseController { pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList<>(); MultipartFile file = files[0]; String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" +fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); pd2.put("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); // pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); // pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + map.put("dockData", JSON.toJSONString(pd2)); GFhotworkService.edit(pd2); } map.put("result", errInfo); return map; } + /**修改 * @param * @throws Exception @@ -298,6 +314,7 @@ public class AppGFHotworkController extends BaseController { @RequestMapping(value="/editConfess") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editConfess( @RequestParam(value="FFILE",required=false) MultipartFile[] files ) throws Exception{ @@ -310,21 +327,26 @@ public class AppGFHotworkController extends BaseController { pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList<>(); MultipartFile file = files[0]; String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" +fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); // pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); // pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + map.put("dockData", JSON.toJSONString(pd2)); GFhotworkService.edit(pd2); } map.put("result", errInfo); return map; } + /**修改 * @param * @throws Exception @@ -332,6 +354,7 @@ public class AppGFHotworkController extends BaseController { @RequestMapping(value="/editAcceptconfess") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editAcceptconfess(MultipartRequest request) throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -345,19 +368,28 @@ public class AppGFHotworkController extends BaseController { String signertime = ""; String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + ArrayList pictureList = new ArrayList<>(); + HashMap pdMap = new HashMap(); for (int i = 0; i < SIGNTIME.length; i++) { signertime = SIGNTIME[i]; fileList.add(request.getFile("file" + i)); MultipartFile[] fileArr = new MultipartFile[fileList.size()]; - saveImg(fileList.toArray(fileArr), signertime, pd.getString("HOTWORK_ID"), pd.getString("CORPINFO_ID"), pd.getString("ACCEPT_CONFESS_USER_ID"), pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID")); + saveImg(fileList.toArray(fileArr), signertime, pd.getString("HOTWORK_ID"), + pd.getString("CORPINFO_ID"), pd.getString("ACCEPT_CONFESS_USER_ID"), + pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"), pictureList, pdMap); fileList.clear(); } + map.put("sendPicturesList", JSON.toJSONString(pictureList)); + map.put("dockData", JSON.toJSONString(pdMap)); map.put("result", errInfo); return map; } - private void saveImg(MultipartFile[] files, String signertime, String HOTWORK_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception { + private void saveImg(MultipartFile[] files, String signertime, String HOTWORK_ID, + String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, + String ACCEPT_CONFESS_DEPARTMENT_ID, ArrayList pictureList, Map pdMap) throws Exception { if (files != null && files.length > 0) { + int count = 1; for (int i = 0; i < files.length; i++) { PageData pd = new PageData(); pd = this.getPageData(); @@ -377,6 +409,9 @@ public class AppGFHotworkController extends BaseController { pd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ACCEPT_CONFESS_DEPARTMENT_ID); pd.put("ACCEPT_USER_ID",""); pd.put("ACCEPT_DEPARTMENT_ID", ""); + pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" +fileName); + pdMap.put("other" + count, JSON.toJSONString(pd)); + count += 1; hotworkacceptuserService.save(pd); } } @@ -391,6 +426,7 @@ public class AppGFHotworkController extends BaseController { @RequestMapping(value = "/editAcceptStatus") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editAcceptStatus(MultipartRequest request) throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -407,6 +443,7 @@ public class AppGFHotworkController extends BaseController { log.put("CREATOR", pd.get("ACTION_USER")); log.put("CREATTIME", DateUtil.date2Str(new Date())); + map.put("dockData", JSON.toJSONString(pd)); String status = pd.get("STATUS").toString(); if ("2".equals(status) || "3".equals(status) || "4".equals(status) || "5".equals(status) || "6".equals(status) || "7".equals(status)) { pd2.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + @@ -423,16 +460,26 @@ public class AppGFHotworkController extends BaseController { String signertime = ""; String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + ArrayList pictureList = new ArrayList<>(); + HashMap pdMap = new HashMap(); for (int i = 0; i < SIGNTIME.length; i++) { signertime = SIGNTIME[i]; fileList.add(request.getFile("file" + i)); MultipartFile[] fileArr = new MultipartFile[fileList.size()]; - saveAcceptImg(fileList.toArray(fileArr), signertime, pd.getString("HOTWORK_ID"), pd.getString("CORPINFO_ID"), pd.getString("ACCEPT_USER_ID"), pd.getString("ACCEPT_DEPARTMENT_ID")); + saveAcceptImg(fileList.toArray(fileArr), signertime, + pd.getString("HOTWORK_ID"), + pd.getString("CORPINFO_ID"), + pd.getString("ACCEPT_USER_ID"), + pd.getString("ACCEPT_DEPARTMENT_ID"), + pictureList, pdMap); fileList.clear(); } + map.put("pdMap", JSON.toJSONString(pdMap)); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); GFhotworkService.edit(pd2); + map.put("dockDatapd2", JSON.toJSONString(pd2)); log.put("ACTION", "验收通过"); // 发短信 @@ -461,6 +508,7 @@ public class AppGFHotworkController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); GFhotworkService.edit(pd2); + map.put("dockDatapd2", JSON.toJSONString(pd2)); // 发短信 PageData mes6 = new PageData(); @@ -491,13 +539,22 @@ public class AppGFHotworkController extends BaseController { break; } GFhotworkLogService.save(log); + map.put("dockDataLog", JSON.toJSONString(log)); map.put("result", errInfo); return map; } - private void saveAcceptImg(MultipartFile[] files,String signertime, String HOTWORK_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{ + private void saveAcceptImg(MultipartFile[] files, + String signertime, + String HOTWORK_ID, + String CORPINFO_ID, + String ACCEPT_USER_ID, + String ACCEPT_DEPARTMENT_ID, + ArrayList pictureList, + HashMap pdMap) throws Exception{ if (files != null && files.length > 0) { + int count = 1; for (int i = 0; i < files.length; i++) { PageData cpd = new PageData(); cpd = this.getPageData(); @@ -517,6 +574,9 @@ public class AppGFHotworkController extends BaseController { cpd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ""); cpd.put("ACCEPT_CONFESS_USER_ID", ""); cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID); + pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName); + pdMap.put("other" + count, JSON.toJSONString(cpd)); + count += 1; hotworkacceptuserService.save(cpd); } } @@ -531,6 +591,7 @@ public class AppGFHotworkController extends BaseController { @RequestMapping(value="/editStatus") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editStatus( @RequestParam(value="FFILE",required=false) MultipartFile[] files ) throws Exception{ @@ -549,6 +610,7 @@ public class AppGFHotworkController extends BaseController { log.put("CREATOR",pd.get("ACTION_USER")); log.put("CREATTIME", DateUtil.date2Str(new Date())); + map.put("dockData", JSON.toJSONString(pd)); String status = pd.get("STATUS").toString(); if ("2".equals(status) || "3".equals(status) || "4".equals(status) || "5".equals(status) || "6".equals(status) || "7".equals(status)) { pd2.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + @@ -561,19 +623,25 @@ public class AppGFHotworkController extends BaseController { switch (status) { case "2"://确认 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList(); MultipartFile file = files[0]; String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); pd2.put("CONFIRM_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONFIRM_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("CONFIRM_CONTENT", pd.get("CONTENT")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + map.put("dockDatapd2", JSON.toJSONString(pd2)); GFhotworkService.edit(pd2); GFhotworkToMeasuresService.delete(pd2); List list = (List) JSON.parse(pd.get("measuresList").toString()); + HashMap measuresMap = new HashMap(); + int measuresCount = 1; for (JSONObject json : list) { PageData measures = new PageData(); measures.put("HOTWORKTOMEASURES_ID", this.get32UUID()); // 主键 @@ -586,8 +654,11 @@ public class AppGFHotworkController extends BaseController { measures.put("STATUS", json.get("STATUS")); measures.put("CONFIRM_ID", pd.get("OPERATOR")); measures.put("CONFIRM_NAME", pd.get("ACTION_USER")); + measuresMap.put("other" + measuresCount, JSON.toJSONString(measures)); + measuresCount += 1; GFhotworkToMeasuresService.save(measures); } + map.put("dockDatameasuresMap", JSON.toJSONString(measuresMap)); log.put("ACTION", "作业单位通过"); @@ -681,6 +752,7 @@ public class AppGFHotworkController extends BaseController { pd2.put("LEADER_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("LEADER_CONTENT", pd.get("CONTENT")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + map.put("dockDatapd2", JSON.toJSONString(pd2)); GFhotworkService.edit(pd2); log.put("ACTION", "单位负责人确认"); @@ -742,6 +814,7 @@ public class AppGFHotworkController extends BaseController { pd2.put("AUDIT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("AUDIT_CONTENT", pd.get("CONTENT")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + map.put("dockDatapd2", JSON.toJSONString(pd2)); GFhotworkService.edit(pd2); log.put("ACTION", "安全部门审核通过"); @@ -796,6 +869,7 @@ public class AppGFHotworkController extends BaseController { pd2.put("APPROVE_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("APPROVE_CONTENT", pd.get("CONTENT")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + map.put("dockDatapd2", JSON.toJSONString(pd2)); GFhotworkService.edit(pd2); log.put("ACTION", "审批部门通过"); @@ -844,6 +918,7 @@ public class AppGFHotworkController extends BaseController { pd2.put("MONITOR_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("MONITOR_CONTENT", pd.get("CONTENT")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + map.put("dockDatapd2", JSON.toJSONString(pd2)); GFhotworkService.edit(pd2); log.put("ACTION", "班长验票通过"); @@ -911,6 +986,7 @@ public class AppGFHotworkController extends BaseController { pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + map.put("dockDatapd2", JSON.toJSONString(pd2)); GFhotworkService.edit(pd2); log.put("ACTION", "验收通过"); @@ -939,6 +1015,7 @@ public class AppGFHotworkController extends BaseController { log.put("ACTION", "作业单位打回"); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("CONFIRM_CONTENT", pd.get("CONTENT")); + map.put("dockDatapd2", JSON.toJSONString(pd2)); GFhotworkService.edit(pd2); // 发短信 @@ -999,6 +1076,7 @@ public class AppGFHotworkController extends BaseController { log.put("ACTION", "单位负责人打回"); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("AUDIT_CONTENT", pd.get("CONTENT")); + map.put("dockDatapd2", JSON.toJSONString(pd2)); GFhotworkService.edit(pd2); // 发短信 @@ -1030,6 +1108,7 @@ public class AppGFHotworkController extends BaseController { log.put("ACTION", "安全部门打回"); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPROVE_CONTENT", pd.get("CONTENT")); + map.put("dockDatapd2", JSON.toJSONString(pd2)); GFhotworkService.edit(pd2); // 发短信 @@ -1061,6 +1140,7 @@ public class AppGFHotworkController extends BaseController { log.put("ACTION", "审批部门打回"); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + map.put("dockDatapd2", JSON.toJSONString(pd2)); GFhotworkService.edit(pd2); // 发短信 PageData mes4 = new PageData(); @@ -1091,6 +1171,7 @@ public class AppGFHotworkController extends BaseController { log.put("ACTION", "班长验票打回"); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + map.put("dockDatapd2", JSON.toJSONString(pd2)); GFhotworkService.edit(pd2); // 发短信 PageData mes5 = new PageData(); @@ -1121,6 +1202,7 @@ public class AppGFHotworkController extends BaseController { log.put("ACTION", "验收人打回"); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + map.put("dockDatapd2", JSON.toJSONString(pd2)); GFhotworkService.edit(pd2); // 发短信 @@ -1151,6 +1233,7 @@ public class AppGFHotworkController extends BaseController { default: break; } + map.put("dockDataLog", JSON.toJSONString(log)); GFhotworkLogService.save(log); map.put("result", errInfo); return map; @@ -1162,12 +1245,14 @@ public class AppGFHotworkController extends BaseController { */ @PostMapping(value = "/cancel") @ResponseBody + @DockAnnotation public void cancel(@RequestBody PageData pd) throws Exception { Map map = new HashMap(); String errInfo = "success"; System.out.println(JSONObject.toJSONString(pd)); PageData cpd = new PageData(); cpd = GFhotworkService.findById(pd); + map.put("dockDatacpd", JSON.toJSONString(cpd)); if (cpd != null && cpd.size() > 0 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("MONITOR_USER_SIGNER_TIME") != null) { // String WORK_START_DATE = pd.getString("WORK_START_DATE"); // String ANALYZE_TIME = cpd.getString("ANALYZE_TIME"); @@ -1216,12 +1301,14 @@ public class AppGFHotworkController extends BaseController { // } }else if (cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") == null){ pd.put("APPLY_STATUS",-98); + map.put("dockData", JSON.toJSONString(pd)); GFhotworkService.cancel(pd); PageData pd2 = new PageData(); pd2 = GFhotworkService.checkno(pd); PageData pd3 = new PageData(); pd3.put("CHECK_NO",pd2.getString("CHECK_NO")); pd3.put("CORPINFO_ID",pd.getString("CORPINFO_ID")); + map.put("dockDatapd3", JSON.toJSONString(pd3)); GFhotworkService.editSpecialwork(pd3); GFhotworkService.editSpecialwork1(pd3); GFhotworkService.editSpecialwork2(pd3); @@ -1250,12 +1337,14 @@ public class AppGFHotworkController extends BaseController { sendMessageUtil.sendMessages(mes, paramsList); }else if (cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("MONITOR_USER_SIGNER_TIME") == null){ pd.put("APPLY_STATUS",-99); + map.put("dockData", JSON.toJSONString(pd)); GFhotworkService.cancel(pd); PageData pd2 = new PageData(); pd2 = GFhotworkService.checkno(pd); PageData pd3 = new PageData(); pd3.put("CHECK_NO",pd2.getString("CHECK_NO")); pd3.put("CORPINFO_ID",pd.getString("CORPINFO_ID")); + map.put("dockDatapd3", JSON.toJSONString(pd3)); GFhotworkService.editSpecialwork(pd3); GFhotworkService.editSpecialwork1(pd3); GFhotworkService.editSpecialwork2(pd3); @@ -1414,11 +1503,13 @@ public class AppGFHotworkController extends BaseController { */ @RequestMapping(value="/gas/delete") @ResponseBody + @DockAnnotation public Object gasDel() throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + map.put("dockData", JSON.toJSONString(pd)); GFhotworkGasService.delete(pd); map.put("result", errInfo); //返回结果 return map; @@ -1430,6 +1521,7 @@ public class AppGFHotworkController extends BaseController { */ @RequestMapping(value="/gas/save") @ResponseBody + @DockAnnotation(isAdd = true) public Object gasSave() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -1437,6 +1529,7 @@ public class AppGFHotworkController extends BaseController { pd = this.getPageData(); pd.put("HOTWORKGAS_ID", this.get32UUID()); //主键 pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 + map.put("dockData", JSON.toJSONString(pd)); GFhotworkGasService.save(pd); GFhotworkService.edittime(pd); map.put("result", errInfo); //返回结果