| | |
| | | import com.ruoyi.common.utils.DateUtils; |
| | | import com.ruoyi.common.utils.security.ShiroUtils; |
| | | import com.ruoyi.doublePrevention.entity.PreventRiskDangerConfirmLog; |
| | | import com.ruoyi.doublePrevention.entity.PreventRiskDangerInfo; |
| | | import com.ruoyi.doublePrevention.service.RiskService; |
| | | import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerConfirmLogService; |
| | | import com.ruoyi.framework.aspectj.lang.annotation.Log; |
| | |
| | | /** |
| | | * 隐患核查--下一个核查人 |
| | | */ |
| | | @Log(title = "隐患核查--核查") |
| | | @GetMapping("/editNextConfirm/{id}") |
| | | public String editNextConfirm(@PathVariable("id") Long id, ModelMap mmap) { |
| | | //隐患排查实体 |
| | | HiddenDangerCheckPoint hiddenDangerCheckPoint = hiddenDangerCheckPointService.selectHiddenDangerCheckPointById(Long.valueOf(id)); |
| | | mmap.put("hdcp", hiddenDangerCheckPoint); |
| | | |
| | | //获取所在公司人员信息 |
| | | User sysUser = getSysUser(); |
| | | if (sysUser != null && sysUser.getCompanyId() != null) { |
| | | User userTemp = new User(); |
| | | userTemp.setCompanyId(sysUser.getCompanyId()); |
| | | List<User> userList = userService.selectUserList(userTemp); |
| | | mmap.put("userList", userList); |
| | | } |
| | | return prefix + "/editNextConfirm"; |
| | | } |
| | | |
| | | /** |
| | | * 隐患核查--下一个核查人 |
| | | */ |
| | | @Log(title = "隐患核查--下一个核查人") |
| | | @GetMapping("/nextConfirm") |
| | | public AjaxResult nextConfirm(HiddenDangerCheckPoint hdcp) { |
| | | @PostMapping("/editNextConfirmSave") |
| | | @ResponseBody |
| | | public AjaxResult editNextConfirmSave(HiddenDangerCheckPoint hdcp) { |
| | | //获取当前更新用户信息 |
| | | User sysUser = getSysUser(); |
| | | |
| | | if(ObjectUtils.isEmpty(hdcp.getId())){ |
| | | return AjaxResult.error("id不能为空"); |
| | | } |
| | | // report_status , 上报判定结果(0未判定 1不是隐患 2是隐患) |
| | | // if(ObjectUtils.isEmpty(hdcp.getReportStatus())){ |
| | | // return AjaxResult.error("判定结果不能为空"); |
| | | // } |
| | | // examine_user_id , 核查人id |
| | | if(ObjectUtils.isEmpty(hdcp.getExamineUserId())){ |
| | | return AjaxResult.error("核查人Id不能为空"); |
| | |
| | | if(ObjectUtils.isEmpty(hdcp.getExamineUserName())){ |
| | | return AjaxResult.error("核查人姓名不能为空"); |
| | | } |
| | | // examine_opinion 意见 |
| | | // if(ObjectUtils.isEmpty(hdcp.getRectifyDeadlineTime())){ |
| | | // return AjaxResult.error("核查意见不能为空"); |
| | | // } |
| | | |
| | | |
| | | // 原数据表,现在不做操作 |
| | | // int i = hiddenDangerCheckPointService.(hcdp); |
| | | |
| | | int i = confirmLogService.saveConfirmLog(hdcp); |
| | | if (i < 1){ |
| | | return AjaxResult.error("操作失败"); |
| | | } |
| | | return AjaxResult.success(); |
| | | |
| | | return toAjax(i); |
| | | } |
| | | |
| | | /** |
| | |
| | | //获取当前更新用户信息 |
| | | User sysUser = getSysUser(); |
| | | |
| | | // todo-2023 此处最终核查 |
| | | // todo-2024 |
| | | hiddenDangerCheckPoint.setUpdateBy(ShiroUtils.getLoginName()); |
| | | hiddenDangerCheckPoint.setUpdateTime(DateUtils.getNowDate()); |
| | | hiddenDangerCheckPoint.setExamineCreateTime(DateUtils.getNowDate());//设置核查时间 |
| | |
| | | if(hiddenDangerCheckPoint.getRectifyDeadlineTime()!=null) { |
| | | rectifyRemindJPush(hiddenDangerCheckPoint); |
| | | } |
| | | //此处插入隐患附属表 |
| | | //此处插入隐患附属表 20250623 位置变更注释掉 |
| | | //HiddenDangerCheckPoint hiddenDangerCheckPointById = hiddenDangerCheckPointService.getHiddenDangerCheckPointById(hiddenDangerCheckPoint.getId()); |
| | | int result = riskService.insertDangerInfo(hiddenDangerCheckPoint.getId(), hiddenDangerCheckPoint); |
| | | if (result< 1){ |
| | | throw new RuntimeException("添加隐患附属信息失败"); |
| | | } |
| | | // int result = riskService.insertDangerInfo(hiddenDangerCheckPoint.getId(), hiddenDangerCheckPoint); |
| | | // if (result< 1){ |
| | | // throw new RuntimeException("添加隐患附属信息失败"); |
| | | // } |
| | | |
| | | HiddenDangerCheckPoint hdcp = hiddenDangerCheckPointService.getHiddenDangerCheckPointById(hiddenDangerCheckPoint.getId()); |
| | | int confirmResult = confirmLogService.saveConfirmLog(hdcp); |
| | |
| | | public String detailDangerExamine(@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("hdcp", hiddenDangerCheckPoint); |
| | | return prefix + "/detailDangerExamine"; |
| | | } |