src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
@@ -1048,19 +1048,20 @@ dangerInfo.setDangerResult(hdcp.getDangerResult()); dangerInfo.setHazardDangerType(hdcp.getHazardDangerType()); //隐患状态 0未验收 1验收通过 2验收未通过 ，新建时为空 if (hdcp.getAcceptStatus() == null){ //设置为 空 dangerInfo.setDangerState(null); } else if (hdcp.getAcceptStatus().equals(0)){ //设置为整改中 dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode()); } else if (hdcp.getAcceptStatus().equals(1)) { //设置为已验收 dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode()); }else if (hdcp.getAcceptStatus().equals(2)){ //设置为超期未整改 dangerInfo.setDangerState(StatusEnum.RECTIFY_TIMEOUT_AND_FAIL.getCode()); } // if (hdcp.getAcceptStatus() == null){ // //设置为 空 // dangerInfo.setDangerState(null); // } else if (hdcp.getAcceptStatus().equals(0)){ // //设置为整改中 // dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode()); // } else if (hdcp.getAcceptStatus().equals(1)) { // //设置为已验收 // dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode()); // }else if (hdcp.getAcceptStatus().equals(2)){ // //设置为超期未整改 // dangerInfo.setDangerState(StatusEnum.RECTIFY_TIMEOUT_AND_FAIL.getCode()); // } dangerInfo.setDangerState(null); //设置为 空 dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能，先设为空 //获取上报主配置信息 PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode()); @@ -1231,11 +1232,11 @@ PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo(); dangerInfo.setDangerCheckPointId(hdcp.getId()); int acceptStatus = Integer.parseInt(hdcp.getAcceptStatus()); //如果验收通过，设置为验收成功；验收失败，打回上一级进行整改，设置为整改中 if (hdcp.getAcceptStatus().equals(0)){ if (acceptStatus == 0){ dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode()); }else if (hdcp.getAcceptStatus().equals(1)){ }else if (acceptStatus == 1){ dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode()); }
@@ -91,12 +91,12 @@ } else if ("1".equals(hiddenDangerCheckPoint.getAcceptResult())) { hiddenDangerCheckPoint.setAcceptCreateTime(DateUtils.getNowDate());//设置验收时间 hiddenDangerCheckPoint.setAcceptStatus(TrHiddenDangerCheckConstants.ACCEPT_STATUS_ALREADY_ACCEPT_PASS);//验收状态(验收通过) } } int i = hiddenDangerCheckPointService.updateHiddenDangerCheckPoint(hiddenDangerCheckPoint); // todo-2022 验收通过 // todo-2022 验收通过,修改为已验收状态 int result = riskService.updateDangerInfoAccept(hiddenDangerCheckPoint); if (result < 1){ throw new RuntimeException("隐患验收信息保存失败"); src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerBaseController.java
@@ -126,7 +126,7 @@ /** * 根据隐患排查checkId获取基础清单下的检查点，并合并检查内容相同的行 todo * 根据隐患排查checkId获取基础清单下的检查点，并合并检查内容相同的行 */ @PostMapping("/selectBaseCheckPointListByCheckIdAndMergeSamePoint") @ResponseBody src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java
@@ -5,6 +5,7 @@ import com.ruoyi.common.constant.TrHiddenDangerCheckConstants; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.security.ShiroUtils; import com.ruoyi.doublePrevention.service.RiskService; import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.framework.web.controller.BaseController; @@ -47,6 +48,10 @@ @Autowired JpushService jpushService; @Autowired private RiskService riskService; @GetMapping() public String dangerExamine() { @@ -142,10 +147,19 @@ hiddenDangerCheckPoint.setWhetherDanger(TrHiddenDangerCheckConstants.WHETHER_DANGER_NOT);//是否为隐患(正常) } } int i = hiddenDangerCheckPointService.updateHiddenDangerCheckPoint(hiddenDangerCheckPoint); if(hiddenDangerCheckPoint.getRectifyDeadlineTime()!=null) { rectifyRemindJPush(hiddenDangerCheckPoint); } // todo-2022 此处插入附属表 // HiddenDangerCheckPoint hiddenDangerCheckPointById = hiddenDangerCheckPointService.getHiddenDangerCheckPointById(hiddenDangerCheckPoint.getId()); int result = riskService.insertDangerInfo(hiddenDangerCheckPoint.getId(), hiddenDangerCheckPoint); if (result< 1){ throw new RuntimeException("添加隐患附属信息失败"); } hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送 return toAjax(i); } @@ -167,13 +181,8 @@ extrasMap.put("methodType", "goToRectify"); extrasMap.put("hiddenDangerCheckPoint", JSONObject.toJSONString(whole)); //大文本通知栏样式 jpushService.sendPushByAndroidBigText(title, content, 1, content, extrasMap, whole.getRectifyUserId().toString()); }
@@ -157,7 +157,6 @@ export.setRiskPointName("-"); } //风险单元类型 if ("1".equals(hcp.getRiskType())) { export.setRiskPointType("设备设施清单"); src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerPlanExecuteController.java
@@ -400,8 +400,8 @@ /** * 检查点隐患登记--保存 * todo-2022 手机端-暂时未改动 * 检查点隐患登记--保存 na li lai de huo dong ,rang ye hen xin dong ,wojiu zhiji na zou le a * todo-2022 手机端 */ @Log(title = "检查点隐患登记--保存", businessType = BusinessType.UPDATE) @PostMapping("/editPointDangerRegisterSave") @@ -420,7 +420,6 @@ hiddenDangerCheckPoint.setDangerSources(TrHiddenDangerCheckConstants.DANGER_SOURCES_PLAN_PRODUCE); //隐患来源(隐患计划排查生成) HiddenDangerCheckPoint queryExist = new HiddenDangerCheckPoint(); queryExist.setWhetherDanger(TrHiddenDangerCheckConstants.WHETHER_DANGER_YES);//是否为隐患(是隐患) queryExist.setCheckPointId(hiddenDangerCheckPoint.getCheckPointId()); @@ -435,24 +434,24 @@ hiddenDangerCheckPoint.setCompanyId(getSysUser().getCompanyId()); i = hiddenDangerCheckPointService.insertHiddenDangerCheckPoint(hiddenDangerCheckPoint); // todo-2022 此处插入附属表 //获取Id返回值 hiddenDangerCheckPoint.getId(); int result = riskService.insertDangerInfo(hiddenDangerCheckPoint.getId(), hiddenDangerCheckPoint); if (result< 1){ throw new RuntimeException("添加隐患附属信息失败"); } // // todo-2022 此处插入附属表 // //获取Id返回值 // hiddenDangerCheckPoint.getId(); // int result = riskService.insertDangerInfo(hiddenDangerCheckPoint.getId(), hiddenDangerCheckPoint); // if (result< 1){ // throw new RuntimeException("添加隐患附属信息失败"); // } } else { hiddenDangerCheckPoint.setUpdateBy(getSysUser().getLoginName()); hiddenDangerCheckPoint.setUpdateTime(DateUtils.getNowDate()); i = hiddenDangerCheckPointService.updateHiddenDangerCheckPoint(hiddenDangerCheckPoint); // todo-2022 此处修改附属表 int result = riskService.updateDangerInfo(hiddenDangerCheckPoint); if (result < 1){ throw new RuntimeException("修改失败"); } // // todo-2022 此处修改附属表 // int result = riskService.updateDangerInfo(hiddenDangerCheckPoint); // if (result < 1){ // throw new RuntimeException("修改失败"); // } } hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送 return toAjax(i); src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRectifyController.java
@@ -102,7 +102,7 @@ hiddenDangerCheckPoint.setStage(TrHiddenDangerCheckConstants.DANGER_STAGE_PLAN_ACCEPT);//隐患验收阶段(数据进入到隐患验收阶段) int i = hiddenDangerCheckPointService.updateHiddenDangerCheckPoint(hiddenDangerCheckPoint); // todo-2022 隐患信息保存 // todo-2022 隐患信息附属表 int result = riskService.updateDangerInfoRectify(hiddenDangerCheckPoint); if (result < 1){ throw new RuntimeException("整改信息保存失败"); src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java
@@ -113,7 +113,6 @@ List<HiddenDangerCheckPoint> resultList = new ArrayList<>(); for (HiddenDangerCheckPoint dangerCheckPoint : list) { // todo-2022 修改前查询 PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoById(dangerCheckPoint.getId()); if (ObjectUtils.isNotEmpty(dangerInfo)){ dangerCheckPoint.setHazardCode(dangerInfo.getHazardCode()); @@ -122,10 +121,9 @@ dangerCheckPoint.setHazardDangerType(dangerInfo.getHazardDangerType()); dangerCheckPoint.setDangerResult(dangerInfo.getDangerResult()); } resultList.add(dangerCheckPoint); } return getDataTable(resultList); return getDataTable(list); } /** @@ -154,7 +152,6 @@ /** * 新增保存隐患上报 * todo-2022 隐患上报 tr_hidden_danger_check_point */ @Log(title = "隐患上报", businessType = BusinessType.INSERT) @PostMapping("/addDangerReportSave") @@ -184,13 +181,13 @@ throw new RuntimeException("添加隐患信息失败"); } // todo-2022 此处插入附属表 //获取Id返回值 hdcp.getId(); int result = riskService.insertDangerInfo(hdcp.getId(), hdcp); if (result< 1){ throw new RuntimeException("添加隐患附属信息失败"); } // // 此处插入附属表 --- 此处已弃用，在核查整改后插入 // //获取Id返回值 // hdcp.getId(); // int result = riskService.insertDangerInfo(hdcp.getId(), hdcp); // if (result< 1){ // throw new RuntimeException("添加隐患附属信息失败"); // } hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送 @@ -243,7 +240,7 @@ hiddenDangerCheck.setDangerPlaceName(hdcp.getDangerPlaceName()); hiddenDangerCheckService.insertHiddenDangerCheck(hiddenDangerCheck);//构造隐患排查对象保存，主要保存隐患责任部门，隐患地点 // todo-2022 1.全流程隐患上报信息封装 //1.全流程隐患上报信息封装 hdcp.setCheckId(hiddenDangerCheck.getCheckId()); @@ -279,7 +276,7 @@ hdcp.setExamineStatus(TrHiddenDangerCheckConstants.EXAMINE_STATUS_NOT_EXAMINE);//核查状态(待核查) } } // todo-2022 2.全流程隐患提交信息封装-未操作 //2.全流程隐患提交信息封装-未操作 //隐患核查 @@ -295,8 +292,7 @@ } } // todo-2022 3.全流程隐患核查信息封装-未操作 //3.全流程隐患核查信息封装-未操作 //隐患整改 // hdcp.setRectifyCreateTime(DateUtils.getNowDate());//设置整改时间 @@ -305,7 +301,7 @@ hdcp.setStage(TrHiddenDangerCheckConstants.DANGER_STAGE_PLAN_ACCEPT);//隐患验收阶段(数据进入到隐患验收阶段) // todo-2022 4.全流程隐患整改信息封装-未操作 //4.全流程隐患整改信息封装-未操作 //隐患验收 if (!StringUtils.isEmpty(hdcp.getAcceptResult())) { @@ -319,7 +315,7 @@ // hdcp.setAcceptCreateTime(DateUtils.getNowDate());//设置验收时间 hdcp.setAcceptStatus(TrHiddenDangerCheckConstants.ACCEPT_STATUS_ALREADY_ACCEPT_PASS);//验收状态(验收通过) // todo-2022 5.全流程隐患验收信息封装-未操作 //5.全流程隐患验收信息封装-未操作 } } @@ -402,10 +398,10 @@ hiddenDangerCheckPointService.updateHiddenDangerCheckPoint(hiddenDangerCheckPoint); // todo-2022 此处修改附属表 int result = riskService.updateDangerInfo(hiddenDangerCheckPoint); if (result < 1){ throw new RuntimeException("修改失败"); } // int result = riskService.updateDangerInfo(hiddenDangerCheckPoint); // if (result < 1){ // throw new RuntimeException("修改失败"); // } hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送 return AjaxResult.success(); @@ -465,11 +461,11 @@ hiddenDangerCheckPoint.setStage(TrHiddenDangerCheckConstants.DANGER_STAGE_PLAN_EXAMINE);//隐患核查阶段(数据进入到隐患核查阶段) hiddenDangerCheckPoint.setExamineStatus(TrHiddenDangerCheckConstants.EXAMINE_STATUS_NOT_EXAMINE);//核查状态(待核查) // todo-2022 隐患信息判定 int result = riskService.updateDangerInfoJudge(hiddenDangerCheckPoint); if (result < 1){ throw new RuntimeException("整改信息保存失败"); } // // todo-2022 隐患信息判定 // int result = riskService.updateDangerInfoJudge(hiddenDangerCheckPoint); // if (result < 1){ // throw new RuntimeException("整改信息保存失败"); // } } } @@ -498,11 +494,10 @@ hiddenDangerCheckService.deleteHiddenDangerCheckById(hdcp.getCheckId()); // todo-2022 此处删除附属表 int result = riskService.deleteDangerInfo(hdcp.getId()); if (result < 1){ throw new RuntimeException("删除失败"); } // int result = riskService.deleteDangerInfo(hdcp.getId()); // if (result < 1){ // throw new RuntimeException("删除失败"); // } hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送 return AjaxResult.success();
