| | |
| | | } |
| | | |
| | | /** |
| | | * 隐患核查--核查 |
| | | */ |
| | | @Log(title = "隐患核查--核查") |
| | | @GetMapping("/nextConfirm/{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 + "/nextConfirm"; |
| | | } |
| | | |
| | | /** |
| | | * 隐患核查--下一个核查人 |
| | | */ |
| | | @Log(title = "隐患核查--下一个核查人") |
| | | @GetMapping("/nextConfirm") |
| | | @PostMapping("/nextConfirm") |
| | | public AjaxResult nextConfirm(HiddenDangerCheckPoint hdcp) { |
| | | //获取当前更新用户信息 |
| | | User sysUser = getSysUser(); |
| | | |
| | | if(ObjectUtils.isEmpty(hdcp.getId())){ |
| | | return AjaxResult.error("id不能为空"); |
| | |
| | | // 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); |
| | | } |
| | | |
| | | /** |