| | |
| | | import com.ruoyi.doublePrevention.entity.PreventRiskDangerInfo; |
| | | import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskUnitCodeAndNameListQueryRespDTO; |
| | | import com.ruoyi.doublePrevention.service.RiskService; |
| | | import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerConfirmLogService; |
| | | import com.ruoyi.framework.aspectj.lang.annotation.Log; |
| | | import com.ruoyi.framework.aspectj.lang.enums.BusinessType; |
| | | import com.ruoyi.framework.web.controller.BaseController; |
| | |
| | | |
| | | @Autowired |
| | | private RiskService riskService; |
| | | |
| | | @Autowired |
| | | private PreventRiskDangerConfirmLogService confirmLogService; |
| | | |
| | | @GetMapping() |
| | | public String hiddenDangerCheck(ModelMap mmap) { |
| | |
| | | List<User> userList = userService.selectUserList(userTemp); |
| | | mmap.put("userList", userList); |
| | | } |
| | | mmap.put("dangerSrc", 0); |
| | | |
| | | //隐患类别 |
| | | HiddenTroubleType hiddenTroubleType = new HiddenTroubleType(); |
| | |
| | | @ResponseBody |
| | | @Transactional |
| | | public AjaxResult addDangerReportSave(HiddenDangerCheckPoint hdcp) { |
| | | if (ObjectUtils.isEmpty(hdcp.getCheckPerson())){ |
| | | throw new RuntimeException("检查人不能为空"); |
| | | } |
| | | if (ObjectUtils.isEmpty(hdcp.getFindTime())){ |
| | | throw new RuntimeException("发现时间不能为空"); |
| | | } |
| | | if (ObjectUtils.isEmpty(hdcp.getDangerSrc())){ |
| | | throw new RuntimeException("隐患来源不能为空"); |
| | | } |
| | | HiddenDangerCheck hiddenDangerCheck = new HiddenDangerCheck(); |
| | | hiddenDangerCheck.setCreateBy(ShiroUtils.getLoginName());//创建者 |
| | | hiddenDangerCheck.setCreateTime(DateUtils.getNowDate());//获取创建时间 |
| | |
| | | throw new RuntimeException("添加隐患信息失败"); |
| | | } |
| | | |
| | | // // 此处插入附属表 --- 此处已弃用,在核查整改后插入 |
| | | // //获取Id返回值 |
| | | // hdcp.getId(); |
| | | // int result = riskService.insertDangerInfo(hdcp.getId(), hdcp); |
| | | // if (result< 1){ |
| | | // throw new RuntimeException("添加隐患附属信息失败"); |
| | | // } |
| | | // 此处插入附属表 --- 此处已弃用,在核查整改后插入20250623再次启用 |
| | | //获取Id返回值 |
| | | hdcp.getId(); |
| | | int result = riskService.insertDangerInfo(hdcp.getId(), hdcp); |
| | | if (result< 1){ |
| | | throw new RuntimeException("添加隐患附属信息失败"); |
| | | } |
| | | |
| | | hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送 |
| | | |
| | |
| | | HiddenDangerCheck hiddenDangerCheck = new HiddenDangerCheck(); |
| | | // hiddenDangerCheck.setCreateBy(ShiroUtils.getLoginName());//创建者 |
| | | // hiddenDangerCheck.setCreateTime(DateUtils.getNowDate());//获取创建时间 |
| | | |
| | | if (ObjectUtils.isEmpty(hdcp.getCheckPerson())){ |
| | | throw new RuntimeException("检查人不能为空"); |
| | | } |
| | | if (ObjectUtils.isEmpty(hdcp.getFindTime())){ |
| | | throw new RuntimeException("发现时间不能为空"); |
| | | } |
| | | if (ObjectUtils.isEmpty(hdcp.getDangerSrc())){ |
| | | throw new RuntimeException("隐患来源不能为空"); |
| | | } |
| | | hiddenDangerCheck.setCreateBy(ShiroUtils.getLoginName());//创建者 |
| | | hiddenDangerCheck.setCreateTime(hdcp.getRectifyCreateTime());//获取创建时间 |
| | | |
| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | /** |
| | | * 修改隐患上报 |
| | | */ |
| | |
| | | // todo-2022 修改前查询 |
| | | PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoById(hdcp.getId()); |
| | | |
| | | hdcp.setHazardCode(dangerInfo.getHazardCode()); |
| | | hdcp.setDangerSrc(dangerInfo.getDangerSrc()); |
| | | hdcp.setDangerReason(dangerInfo.getDangerReason()); |
| | | hdcp.setHazardDangerType(dangerInfo.getHazardDangerType()); |
| | | hdcp.setDangerResult(dangerInfo.getDangerResult()); |
| | | if (ObjectUtils.isNotEmpty(dangerInfo)){ |
| | | hdcp.setHazardCode(dangerInfo.getHazardCode()); |
| | | hdcp.setDangerSrc(dangerInfo.getDangerSrc()); |
| | | hdcp.setDangerReason(dangerInfo.getDangerReason()); |
| | | hdcp.setHazardDangerType(dangerInfo.getHazardDangerType()); |
| | | hdcp.setDangerResult(dangerInfo.getDangerResult()); |
| | | } |
| | | |
| | | mmap.put("hiddenDangerCheckPoint", hdcp); |
| | | |
| | |
| | | hiddenDangerCheckPoint.setUpdateTime(DateUtils.getNowDate());//设置更新时间 |
| | | hiddenDangerCheckPointService.updateHiddenDangerCheckPoint(hiddenDangerCheckPoint); |
| | | |
| | | // todo-2022 此处修改附属表 |
| | | // int result = riskService.updateDangerInfo(hiddenDangerCheckPoint); |
| | | // if (result < 1){ |
| | | // throw new RuntimeException("修改失败"); |
| | | // } |
| | | // todo-2022 此处修改附属表 20250623再次启用 |
| | | int result = riskService.updateDangerInfo(hiddenDangerCheckPoint); |
| | | if (result < 1){ |
| | | throw new RuntimeException("修改失败"); |
| | | } |
| | | |
| | | hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送 |
| | | return AjaxResult.success(); |
| | |
| | | |
| | | /** |
| | | * 修改判定隐患上报保存 |
| | | * todo-2022 隐患核查(判定隐患) 以判定的隐患,才需要上报 |
| | | */ |
| | | @Log(title = "修改判定隐患上报保存", businessType = BusinessType.UPDATE) |
| | | @PostMapping("/editJudgeDangerReportSave") |
| | |
| | | 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("整改信息保存失败"); |
| | |
| | | } |
| | | } |
| | | int i = hiddenDangerCheckPointService.updateHiddenDangerCheckPoint(hiddenDangerCheckPoint); |
| | | |
| | | int result = confirmLogService.saveConfirmLog(hiddenDangerCheckPoint); |
| | | if (result < 1){ |
| | | return AjaxResult.error("操作失败"); |
| | | } |
| | | |
| | | hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送 |
| | | |
| | |
| | | public String detailNotJudge(@PathVariable("id") Long id, ModelMap mmap) { |
| | | //隐患排查检查点信息实体 |
| | | HiddenDangerCheckPoint hiddenDangerCheckPoint = hiddenDangerCheckPointService.selectHiddenDangerCheckPointById(Long.valueOf(id)); |
| | | PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoById(hiddenDangerCheckPoint.getId()); |
| | | if (ObjectUtils.isNotEmpty(dangerInfo)){ |
| | | hiddenDangerCheckPoint.setHazardCode(dangerInfo.getHazardCode()); |
| | | hiddenDangerCheckPoint.setDangerSrc(dangerInfo.getDangerSrc()); |
| | | hiddenDangerCheckPoint.setDangerReason(dangerInfo.getDangerReason()); |
| | | hiddenDangerCheckPoint.setHazardDangerType(dangerInfo.getHazardDangerType()); |
| | | hiddenDangerCheckPoint.setDangerResult(dangerInfo.getDangerResult()); |
| | | } |
| | | mmap.put("hiddenDangerCheckPoint", hiddenDangerCheckPoint); |
| | | return prefix + "/detailNotJudge"; |
| | | } |
| | |
| | | public String detailNotDanger(@PathVariable("id") Long id, ModelMap mmap) { |
| | | //隐患排查检查点信息实体 |
| | | HiddenDangerCheckPoint hiddenDangerCheckPoint = hiddenDangerCheckPointService.selectHiddenDangerCheckPointById(Long.valueOf(id)); |
| | | PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoById(hiddenDangerCheckPoint.getId()); |
| | | if (ObjectUtils.isNotEmpty(dangerInfo)){ |
| | | hiddenDangerCheckPoint.setHazardCode(dangerInfo.getHazardCode()); |
| | | hiddenDangerCheckPoint.setDangerSrc(dangerInfo.getDangerSrc()); |
| | | hiddenDangerCheckPoint.setDangerReason(dangerInfo.getDangerReason()); |
| | | hiddenDangerCheckPoint.setHazardDangerType(dangerInfo.getHazardDangerType()); |
| | | hiddenDangerCheckPoint.setDangerResult(dangerInfo.getDangerResult()); |
| | | } |
| | | mmap.put("hiddenDangerCheckPoint", hiddenDangerCheckPoint); |
| | | return prefix + "/detailNotDanger"; |
| | | } |
| | |
| | | public String detailYesDanger(@PathVariable("id") Long id, ModelMap mmap) { |
| | | //隐患排查检查点信息实体 |
| | | HiddenDangerCheckPoint hiddenDangerCheckPoint = hiddenDangerCheckPointService.selectHiddenDangerCheckPointById(Long.valueOf(id)); |
| | | PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoById(hiddenDangerCheckPoint.getId()); |
| | | if (ObjectUtils.isNotEmpty(dangerInfo)){ |
| | | hiddenDangerCheckPoint.setHazardCode(dangerInfo.getHazardCode()); |
| | | hiddenDangerCheckPoint.setDangerSrc(dangerInfo.getDangerSrc()); |
| | | hiddenDangerCheckPoint.setDangerReason(dangerInfo.getDangerReason()); |
| | | hiddenDangerCheckPoint.setHazardDangerType(dangerInfo.getHazardDangerType()); |
| | | hiddenDangerCheckPoint.setDangerResult(dangerInfo.getDangerResult()); |
| | | } |
| | | mmap.put("hiddenDangerCheckPoint", hiddenDangerCheckPoint); |
| | | return prefix + "/detailYesDanger"; |
| | | } |