From b456b33bc9b034a41fc3ac0fb18df358fe4770db Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Mon, 26 Feb 2024 14:42:44 +0800 Subject: [PATCH] Changes --- .../controller/app/AppHiddenController.java | 2 +- .../controller/bus/HiddenController.java | 2 + .../bus/HiddenExamineController.java | 5 +- .../bus/HotWorkApplicationController.java | 109 +++++++++++++++++- .../firemanager/FireCheckListController.java | 2 + .../FireCheckStandardController.java | 9 +- .../controller/gf/AppGFCutRoadController.java | 12 +- .../gf/AppGFHighWorkController.java | 12 +- .../mybatis/datasource/system/UsersMapper.xml | 1 + .../dsno2/keyProjects/OutSourcedMapper.xml | 9 +- 10 files changed, 141 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/zcloud/controller/app/AppHiddenController.java b/src/main/java/com/zcloud/controller/app/AppHiddenController.java index d5c2721c..884917e7 100644 --- a/src/main/java/com/zcloud/controller/app/AppHiddenController.java +++ b/src/main/java/com/zcloud/controller/app/AppHiddenController.java @@ -1286,7 +1286,7 @@ public class AppHiddenController extends BaseController { List hiddenExa = hiddenExamineService.listAllByHiddenId(pd.getString("HIDDEN_ID")); // 隐患流程信息 List repulsecause = hiddenExamineService.findByHiddenId(pd);//确认人打回信息 for (PageData pageData : hiddenExa) { - if ("0".equals(pageData.getString("TYPE"))) { + if ("4".equals(pageData.getString("TYPE"))) { pd.put("editUserName", pageData.get("editUserName")); pd.put("editDeptName", pageData.get("editDeptName")); pd.put("editLevelName", pageData.get("editLevelName")); diff --git a/src/main/java/com/zcloud/controller/bus/HiddenController.java b/src/main/java/com/zcloud/controller/bus/HiddenController.java index 38392b48..1ffc7e55 100644 --- a/src/main/java/com/zcloud/controller/bus/HiddenController.java +++ b/src/main/java/com/zcloud/controller/bus/HiddenController.java @@ -421,6 +421,7 @@ public class HiddenController extends BaseController { @RequestMapping(value = "/edit") @RequiresPermissions("hidden:edit") @ResponseBody + @DockAnnotation public Object edit() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -441,6 +442,7 @@ public class HiddenController extends BaseController { pd = hiddenService.findById(pd); map.put("pd", pd); map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); return map; } diff --git a/src/main/java/com/zcloud/controller/bus/HiddenExamineController.java b/src/main/java/com/zcloud/controller/bus/HiddenExamineController.java index ad4190aa..6c21a28c 100644 --- a/src/main/java/com/zcloud/controller/bus/HiddenExamineController.java +++ b/src/main/java/com/zcloud/controller/bus/HiddenExamineController.java @@ -305,12 +305,13 @@ public class HiddenExamineController extends BaseController { return map; } hiddenExa.put("OPERATTIME", DateUtil.date2Str(new Date())); - hiddenService.updateHiddenRectificationDeadline(hiddenExa); // 修改隐患的整改期限 + if (pd.getString("STATE").equals("1")){ + hiddenService.updateHiddenRectificationDeadline(hiddenExa); // 修改隐患的整改期限 + } hiddenExa.put("STATE", pd.getString("STATE")); pd.put("OPERATOR", Jurisdiction.getUSER_ID()); pd.put("OPERATTIME", DateUtil.date2Str(new Date())); hiddenexamineService.edit(hiddenExa); - if (Tools.isEmpty(hiddenExa)) { } else { pd.put("HIDDEN_ID", hiddenExa.getString("HIDDEN_ID")); diff --git a/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java b/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java index 5d8d03e7..7633e858 100644 --- a/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java +++ b/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java @@ -6,6 +6,7 @@ import java.util.List; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.app.highriskwork.Model; import com.zcloud.entity.hotWorkApplication.Color; import com.zcloud.entity.hotWorkApplication.Node; @@ -728,12 +729,19 @@ public class HotWorkApplicationController extends BaseController { @RequestMapping(value="/editSuperOpinion") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editSuperOpinion(@RequestParam(value="FFILE203",required=false) MultipartFile[] files203, @RequestParam(value="FFILE204",required=false) MultipartFile[] files204) throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + + PageData dockData = new PageData(); // 主要对接数据 + PageData confinedPageData = new PageData(); // pd对接数据 + confinedPageData.putAll(pd); + dockData.put("dockData", JSON.toJSONString(confinedPageData)); + pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); String type = pd.getString("TYPE"); //1 通过 2.未通过 PageData hotUserPd = new PageData(); @@ -769,6 +777,11 @@ public class HotWorkApplicationController extends BaseController { stateData.put("HOTWORKAPPLICATION_ID", hot.getString("HOTWORKAPPLICATION_ID")); stateData.put("loginUserId", Jurisdiction.getUSER_ID()); stateData.put("STATE", state); + + PageData confinedstateData = new PageData(); // pd对接数据 + confinedstateData.putAll(stateData); + dockData.put("dockDatastateData", JSON.toJSONString(confinedstateData)); + hotworkapplicationService.editByState(stateData);// 把动火状态修改成未通过 messageService.sendMessageByParameter("HOT_MAIL_001", "特级动火作业审批【编号：" + hot.getString("JOB_NUMBER") + "】", Jurisdiction.getCORPINFO_ID(),pd.getString("APPLY_USER_ID"),hot.getString("HOTWORKAPPLICATION_ID"), @@ -789,6 +802,7 @@ public class HotWorkApplicationController extends BaseController { // hotUser.put("AUTOGRAPH",Const.FILEPATHYHTP + pd.get("CORPINFO_ID").toString() + "/" + ffile + "/" + fileName); // } if(StringUtils.isNotBlank(pd.getString("SIGNER_PATH"))){ + ArrayList pictureList = new ArrayList<>(); MultipartFile img = BASE64DecodedMultipartFile.base64ToMultipart(pd.getString("SIGNER_PATH")); String suffixName = img.getOriginalFilename().substring(img.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { @@ -800,6 +814,9 @@ public class HotWorkApplicationController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+img.getOriginalFilename().substring(img.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(img, fileName, Const.FILEPATHYHTP + pd.get("CORPINFO_ID").toString() + "/" + ffile); + + pictureList.add(Const.FILEPATHYHTP + pd.get("CORPINFO_ID").toString() + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); hotUser.put("AUTOGRAPH",Const.FILEPATHYHTP + pd.get("CORPINFO_ID").toString() + "/" + ffile + "/" + fileName); // String path = Model.saveFile(img, Jurisdiction.getCORPINFO_ID()); // pd.put("CONFIRM_SIGNER_PATH", path); @@ -817,11 +834,18 @@ public class HotWorkApplicationController extends BaseController { stateData.put("HOTWORKAPPLICATION_ID", hot.getString("HOTWORKAPPLICATION_ID")); stateData.put("loginUserId", Jurisdiction.getUSER_ID()); stateData.put("STATE", hot.get("STATE").toString()); + + PageData confinedstateData = new PageData(); // pd对接数据 + confinedstateData.putAll(stateData); + dockData.put("dockDatastateData", JSON.toJSONString(confinedstateData)); + hotworkapplicationService.editByState(stateData); // hotworkapplicationService.editByState(hot.getString("HOTWORKAPPLICATION_ID"),hot.get("STATE").toString()); // 单位负责人确认时。保存主要安全措施 if("1".equals(pd.get("STATE").toString()) && pd.get("measureList") != null && Tools.notEmpty(pd.get("measureList").toString())){ List list = (List) JSON.parse(pd.get("measureList").toString()); + Map measuresMap = new HashMap<>(); + int measuresCount = 1; for (JSONObject json : list) { // 因必须选择符合，所以只存需要填的项 if(json.get("ANSWER1") != null || json.get("ANSWER2") != null || json.get("ANSWER3") != null || json.get("ANSWER4") != null){ @@ -834,9 +858,11 @@ public class HotWorkApplicationController extends BaseController { measures.put("ANSWER3", json.get("ANSWER3")); measures.put("ANSWER4", json.get("ANSWER4")); measures.put("STATUS", json.get("radio")); + measuresMap.put("other" + measuresCount, JSON.toJSONString(measures)); + measuresCount++; hotworkToMeasuresService.save(measures); } - + dockData.put("dockDatameasuresMap", JSON.toJSONString(measuresMap)); } } if(Tools.notEmpty(pd.getString("projectSupervisor_USER_ID"))){ //特级动火初审站内信 @@ -876,6 +902,10 @@ public class HotWorkApplicationController extends BaseController { leaderUser.put("CREATTIME",DateUtil.date2Str(new Date())); leaderUser.put("OPERATOR",pd.getString("loginUserId")); leaderUser.put("OPERATTIME",DateUtil.date2Str(new Date())); + + PageData confinedleaderUser = new PageData(); // pd对接数据 + confinedleaderUser.putAll(leaderUser); + dockData.put("dockDataleaderUser", JSON.toJSONString(confinedleaderUser)); hotWorkApplicationUserService.save(leaderUser); // }else if("8".equals(pd.getString("STATE"))){ // 添加动火后现场负责人 PageData leaderUser = new PageData(); @@ -889,6 +919,10 @@ public class HotWorkApplicationController extends BaseController { leaderUser.put("CREATTIME",DateUtil.date2Str(new Date())); leaderUser.put("OPERATOR",pd.getString("loginUserId")); leaderUser.put("OPERATTIME",DateUtil.date2Str(new Date())); + + PageData confinedleaderUser = new PageData(); // pd对接数据 + confinedleaderUser.putAll(leaderUser); + dockData.put("dockDataleaderUser", JSON.toJSONString(confinedleaderUser)); hotWorkApplicationUserService.save(leaderUser); // 添加 动火后负责人 }else if("9".equals(pd.getString("STATE"))){ // 添加 临时监火 PageData leaderUser = new PageData(); @@ -902,6 +936,10 @@ public class HotWorkApplicationController extends BaseController { leaderUser.put("CREATTIME",DateUtil.date2Str(new Date())); leaderUser.put("OPERATOR",pd.getString("loginUserId")); leaderUser.put("OPERATTIME",DateUtil.date2Str(new Date())); + + PageData confinedleaderUser = new PageData(); // pd对接数据 + confinedleaderUser.putAll(leaderUser); + dockData.put("dockDataleaderUser", JSON.toJSONString(confinedleaderUser)); hotWorkApplicationUserService.save(leaderUser); // 添加 动火后负责人 } else if("10".equals(pd.getString("STATE"))){ // 延时监火完成后，进行归档 PageData leaderUser = new PageData(); @@ -915,6 +953,10 @@ public class HotWorkApplicationController extends BaseController { leaderUser.put("CREATTIME",DateUtil.date2Str(new Date())); leaderUser.put("OPERATOR",pd.getString("loginUserId")); leaderUser.put("OPERATTIME",DateUtil.date2Str(new Date())); + + PageData confinedleaderUser = new PageData(); // pd对接数据 + confinedleaderUser.putAll(leaderUser); + dockData.put("dockDataleaderUser", JSON.toJSONString(confinedleaderUser)); hotWorkApplicationUserService.save(leaderUser); // 添加 动火后负责人 } else if("30".equals(pd.getString("STATE"))){ // 特级动火 -- 选择项目主管人员 PageData leaderUser = new PageData(); @@ -928,6 +970,10 @@ public class HotWorkApplicationController extends BaseController { leaderUser.put("CREATTIME",DateUtil.date2Str(new Date())); leaderUser.put("OPERATOR",pd.getString("loginUserId")); leaderUser.put("OPERATTIME",DateUtil.date2Str(new Date())); + + PageData confinedleaderUser = new PageData(); // pd对接数据 + confinedleaderUser.putAll(leaderUser); + dockData.put("dockDataleaderUser", JSON.toJSONString(confinedleaderUser)); hotWorkApplicationUserService.save(leaderUser); }else if("31".equals(pd.getString("STATE"))){ // 特级动火 -- 项目主管部门负责人 //防止打回后有多个意见 @@ -942,11 +988,20 @@ public class HotWorkApplicationController extends BaseController { leaderUser.put("CREATTIME",DateUtil.date2Str(new Date())); leaderUser.put("OPERATOR",pd.getString("loginUserId")); leaderUser.put("OPERATTIME",DateUtil.date2Str(new Date())); + + PageData confinedleaderUser = new PageData(); // pd对接数据 + confinedleaderUser.putAll(leaderUser); + dockData.put("dockDataleaderUser", JSON.toJSONString(confinedleaderUser)); hotWorkApplicationUserService.save(leaderUser); }else if("32".equals(pd.getString("STATE"))){ // 特级动火 PageData back = new PageData(); back.put("STATE","33"); back.put("FOREIGN_KEY",pd.get("HOTWORKAPPLICATION_ID")); + + PageData confinedback = new PageData(); // pd对接数据 + confinedback.putAll(back); + dockData.put("dockDataback", JSON.toJSONString(confinedback)); + hotWorkApplicationUserService.deleteForBack(back); back.put("TYPES",new String [] {"203","204"}); imgfilesService.hideImg(back); @@ -961,8 +1016,14 @@ public class HotWorkApplicationController extends BaseController { leaderUser.put("CREATTIME",DateUtil.date2Str(new Date())); leaderUser.put("OPERATOR",pd.getString("loginUserId")); leaderUser.put("OPERATTIME",DateUtil.date2Str(new Date())); + + PageData confinedleaderUser = new PageData(); // pd对接数据 + confinedleaderUser.putAll(leaderUser); + dockData.put("dockDataleaderUser", JSON.toJSONString(confinedleaderUser)); + hotWorkApplicationUserService.save(leaderUser); if (files203 != null && files203.length > 0) { + ArrayList pictureList = new ArrayList<>(); for (int i = 0; i < files203.length; i++) { MultipartFile file203 = files203[i]; String suffixName = file203.getOriginalFilename().substring(file203.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); @@ -977,15 +1038,21 @@ public class HotWorkApplicationController extends BaseController { // String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 String fileName = this.get32UUID()+file203.getOriginalFilename().substring(file203.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file203, fileName,Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + pictureList.add(Const.FILEPATHYHTP + pd.get("CORPINFO_ID").toString() + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); PageData img = new PageData(); pd.put("IMGFILES_ID", this.get32UUID()); pd.put("FILEPATH", Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); pd.put("TYPE", "203"); pd.put("FOREIGN_KEY", pd.get("HOTWORKAPPLICATION_ID")); + PageData imgFilesData = new PageData(); // pd对接数据 + imgFilesData.putAll(pd); + dockData.put("dockImgFilesData", JSON.toJSONString(imgFilesData)); imgfilesService.save(pd); } } if (files204 != null && files204.length > 0) { + ArrayList pictureList = new ArrayList<>(); for (int i = 0; i < files204.length; i++) { MultipartFile file204 = files204[i]; String suffixName = file204.getOriginalFilename().substring(file204.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); @@ -1000,11 +1067,15 @@ public class HotWorkApplicationController extends BaseController { // String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 String fileName = this.get32UUID()+file204.getOriginalFilename().substring(file204.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file204, fileName,Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + pictureList.add(Const.FILEPATHYHTP + pd.get("CORPINFO_ID").toString() + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); + PageData img = new PageData(); pd.put("IMGFILES_ID", this.get32UUID()); pd.put("FILEPATH", Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); pd.put("TYPE", "204"); pd.put("FOREIGN_KEY", pd.get("HOTWORKAPPLICATION_ID")); + imgfilesService.save(pd); } } @@ -1012,6 +1083,11 @@ public class HotWorkApplicationController extends BaseController { PageData back = new PageData(); back.put("STATE","34"); back.put("FOREIGN_KEY",pd.get("HOTWORKAPPLICATION_ID")); + + PageData confinedback = new PageData(); // pd对接数据 + confinedback.putAll(back); + dockData.put("dockDataback", JSON.toJSONString(confinedback)); + hotWorkApplicationUserService.deleteForBack(back); PageData leaderUser = new PageData(); leaderUser.put("HOTWORKAPPLICATIONUSER_ID", UuidUtil.get32UUID()); @@ -1024,11 +1100,21 @@ public class HotWorkApplicationController extends BaseController { leaderUser.put("CREATTIME",DateUtil.date2Str(new Date())); leaderUser.put("OPERATOR",pd.getString("loginUserId")); leaderUser.put("OPERATTIME",DateUtil.date2Str(new Date())); + + PageData confinedleaderUser = new PageData(); // pd对接数据 + confinedleaderUser.putAll(leaderUser); + dockData.put("dockDataleaderUser", JSON.toJSONString(confinedleaderUser)); + hotWorkApplicationUserService.save(leaderUser); }else if("34".equals(pd.getString("STATE"))){ // 特级动火 PageData back = new PageData(); back.put("STATE","35"); back.put("FOREIGN_KEY",pd.get("HOTWORKAPPLICATION_ID")); + + PageData confinedback = new PageData(); // pd对接数据 + confinedback.putAll(back); + dockData.put("dockDataback", JSON.toJSONString(confinedback)); + hotWorkApplicationUserService.deleteForBack(back); PageData leaderUser = new PageData(); leaderUser.put("HOTWORKAPPLICATIONUSER_ID", UuidUtil.get32UUID()); @@ -1041,6 +1127,11 @@ public class HotWorkApplicationController extends BaseController { leaderUser.put("CREATTIME",DateUtil.date2Str(new Date())); leaderUser.put("OPERATOR",pd.getString("loginUserId")); leaderUser.put("OPERATTIME",DateUtil.date2Str(new Date())); + + PageData confinedleaderUser = new PageData(); // pd对接数据 + confinedleaderUser.putAll(leaderUser); + dockData.put("dockDataleaderUser", JSON.toJSONString(confinedleaderUser)); + hotWorkApplicationUserService.save(leaderUser); }else if("35".equals(pd.getString("STATE"))){ // 特级动火 PageData leaderUser = new PageData(); @@ -1054,6 +1145,11 @@ public class HotWorkApplicationController extends BaseController { leaderUser.put("CREATTIME",DateUtil.date2Str(new Date())); leaderUser.put("OPERATOR",pd.getString("loginUserId")); leaderUser.put("OPERATTIME",DateUtil.date2Str(new Date())); + + PageData confinedleaderUser = new PageData(); // pd对接数据 + confinedleaderUser.putAll(leaderUser); + dockData.put("dockDataleaderUser", JSON.toJSONString(confinedleaderUser)); + hotWorkApplicationUserService.save(leaderUser); }else if("36".equals(pd.getString("STATE"))){ // 特级动火 PageData leaderUser = new PageData(); @@ -1067,11 +1163,22 @@ public class HotWorkApplicationController extends BaseController { leaderUser.put("CREATTIME",DateUtil.date2Str(new Date())); leaderUser.put("OPERATOR",pd.getString("loginUserId")); leaderUser.put("OPERATTIME",DateUtil.date2Str(new Date())); + + PageData confinedleaderUser = new PageData(); // pd对接数据 + confinedleaderUser.putAll(leaderUser); + dockData.put("dockDataleaderUser", JSON.toJSONString(confinedleaderUser)); + hotWorkApplicationUserService.save(leaderUser); } hotUser.put("OPERATOR",pd.getString("loginUserId")); hotUser.put("OPERATTIME",DateUtil.date2Str(new Date())); + + PageData confinedhotUser = new PageData(); // pd对接数据 + confinedhotUser.putAll(hotUser); + dockData.put("dockDatahotUser", JSON.toJSONString(confinedhotUser)); + hotWorkApplicationUserService.edit(hotUser); + map.put("dockData", JSON.toJSONString(dockData)); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/firemanager/FireCheckListController.java b/src/main/java/com/zcloud/controller/firemanager/FireCheckListController.java index 495d505e..7f2fe15b 100644 --- a/src/main/java/com/zcloud/controller/firemanager/FireCheckListController.java +++ b/src/main/java/com/zcloud/controller/firemanager/FireCheckListController.java @@ -291,12 +291,14 @@ public class FireCheckListController extends BaseController { @LogOperation(value = "启用点检表成功", exceptionInformation = "启用点检表失败") @RequestMapping("/openCheck") @ResponseBody + @DockAnnotation public Object openCheck() { Map map = new HashMap(); String errInfo = "success"; PageData pageData = this.getPageData(); fireCheckListService.openCheck(pageData); map.put("result", errInfo); + map.put("dockData",JSON.toJSONString(pageData)); return map; } /** diff --git a/src/main/java/com/zcloud/controller/firemanager/FireCheckStandardController.java b/src/main/java/com/zcloud/controller/firemanager/FireCheckStandardController.java index 2171ea6e..f4cc0911 100644 --- a/src/main/java/com/zcloud/controller/firemanager/FireCheckStandardController.java +++ b/src/main/java/com/zcloud/controller/firemanager/FireCheckStandardController.java @@ -168,6 +168,7 @@ public class FireCheckStandardController extends BaseController { @LogOperation(value = "修改消防器材检查标准成功", exceptionInformation = "修改消防器材检查标准失败", isUpdate = true, updateId = "FIRE_PREPARED_ID" ) @RequestMapping("/edit") @ResponseBody + @DockAnnotation public Object updById() { Map map = new HashMap(); String errInfo = "success"; @@ -177,6 +178,7 @@ public class FireCheckStandardController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); fireCheckStandardService.updCheckStandardById(pd); map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); return map; } @@ -230,6 +232,7 @@ public class FireCheckStandardController extends BaseController { map.put("result", "error"); map.put("msg", "检查表中有使用此检查项的数据禁止删除"); } + map.put("dockData", JSON.toJSONString(pd)); return map; } /** @@ -254,6 +257,7 @@ public class FireCheckStandardController extends BaseController { @LogOperation(value = "导入消防器材检查标准成功", exceptionInformation = "导入消防器材检查标准失败") @RequestMapping(value="/importExcelTemplate") @ResponseBody + @DockAnnotation public Object importExcelTemplate(@RequestParam(name = "FFILE" ,required = false) MultipartFile file) throws Exception{ // Map map = new HashMap(); @@ -268,6 +272,7 @@ public class FireCheckStandardController extends BaseController { * */ PageData typeName = fireCheckStandardService.getTypeName(pageData); String name = (String) typeName.get("NAME"); + List listPd = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = Objects.requireNonNull(file.getOriginalFilename()).substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"xls".equals(suffixName)) { @@ -296,7 +301,7 @@ public class FireCheckStandardController extends BaseController { //Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); //List listPd = (List) ObjectExcelRead.readExcel(filePath, fileName, 1, 0, 0); // 执行读EXCEL操作,读出的数据导入List 2:从第3行开始；0:从第A列开始；0:第0个sheet - List listPd = (List) ObjectExcelRead.readExcel2(dest, 2, 0, 0); + listPd = (List) ObjectExcelRead.readExcel2(dest, 2, 0, 0); //执行读EXCEL操作,读出的数据导入List 2:从第2行开始；0:从第A列开始；0:第0个sheet listPd.forEach(pd->{ /* @@ -315,6 +320,8 @@ public class FireCheckStandardController extends BaseController { fireCheckStandardService.saveImportCheckStandard(listPd); } map.put("result", errInfo); + pageData.put("listPD", listPd); + map.put("dockData", JSON.toJSONString(pageData)); return map; } } diff --git a/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java b/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java index 2a31a8b2..4b8579db 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java @@ -834,14 +834,12 @@ public class AppGFCutRoadController extends BaseController { break; } GFcutRoadLogService.save(log); - PageData dockData = new PageData(); - dockData.put("logData",JSON.toJSONString(log)); - dockData.put("STATUS",status); - dockData.put("saveData",JSON.toJSONString(pd2)); - dockData.put("requestData",JSON.toJSONString(pd)); - dockData.put("toMeasuresList",JSON.toJSONString(toMeasuresList)); + pd.put("log",log); + pd.put("pd2",pd2); + pd.put("toMeasuresList",toMeasuresList); + map.put("dockData", JSON.toJSONString(pd)); + map.put("sendPicturesList", JSON.toJSONString(sendPicturesList)); map.put("result", errInfo); - map.put("dockData", JSON.toJSONString(dockData)); return map; } diff --git a/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java b/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java index 8a25dbf9..3265cc21 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java @@ -1068,13 +1068,11 @@ public class AppGFHighWorkController extends BaseController { break; } GFhighWorkLogService.save(log); - PageData dockData = new PageData(); - dockData.put("logData",JSON.toJSONString(log)); - dockData.put("STATUS",status); - dockData.put("saveData",JSON.toJSONString(pd2)); - dockData.put("requestData",JSON.toJSONString(pd)); - dockData.put("toMeasuresList",JSON.toJSONString(toMeasuresList)); - map.put("dockData", JSON.toJSONString(dockData)); + pd.put("log",log); + pd.put("pd2",pd2); + pd.put("toMeasuresList",toMeasuresList); + map.put("dockData", JSON.toJSONString(pd)); + map.put("sendPicturesList", JSON.toJSONString(sendPicturesList)); map.put("result", errInfo); return map; } diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index fd38f590..42762d14 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -791,6 +791,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from where DEPARTMENT_ID=#{DEPARTMENT_ID} + and ISDELETE = '0' diff --git a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml index 1d43324d..91486b7e 100644 --- a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml +++ b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml @@ -58,7 +58,8 @@ f.IS_SMS, f.GROUP_UNIT, f.MANAGER_DEPARTMENT_ID, - f.JURISDICTION_UNIT + f.JURISDICTION_UNIT, + f.LOCATION @@ -107,7 +108,8 @@ GROUP_UNIT, MANAGER_DEPARTMENT_ID, JURISDICTION_UNIT, - IS_SMS + IS_SMS, + LOCATION @@ -156,7 +158,8 @@ #{GROUP_UNIT}, #{MANAGER_DEPARTMENT_ID}, #{JURISDICTION_UNIT}, - #{IS_SMS} + #{IS_SMS}, + #{LOCATION}