From 1f2b9020ffb33a70f77747a6712c54a86ba1e6af Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期四, 11 七月 2024 15:46:23 +0800
Subject: [PATCH] 纠正业务
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java
index db8c296..32e637c 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java
@@ -122,10 +122,10 @@
}
/**
- * 隐患核查--核查
+ * 隐患核查--下一个核查人
*/
@Log(title = "隐患核查--核查")
- @GetMapping("/nextConfirm/{id}")
+ @GetMapping("/editNextConfirm/{id}")
public String editNextConfirm(@PathVariable("id") Long id, ModelMap mmap) {
//隐患排查实体
HiddenDangerCheckPoint hiddenDangerCheckPoint = hiddenDangerCheckPointService.selectHiddenDangerCheckPointById(Long.valueOf(id));
@@ -139,25 +139,22 @@
List<User> userList = userService.selectUserList(userTemp);
mmap.put("userList", userList);
}
- return prefix + "/nextConfirm";
+ return prefix + "/editNextConfirm";
}
/**
* 隐患核查--下一个核查人
*/
@Log(title = "隐患核查--下一个核查人")
- @PostMapping("/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不能为空");
@@ -166,14 +163,11 @@
if(ObjectUtils.isEmpty(hdcp.getExamineUserName())){
return AjaxResult.error("核查人姓名不能为空");
}
- // examine_opinion 意见
-// if(ObjectUtils.isEmpty(hdcp.getRectifyDeadlineTime())){
-// return AjaxResult.error("核查意见不能为空");
-// }
int i = confirmLogService.saveConfirmLog(hdcp);
if (i < 1){
return AjaxResult.error("操作失败");
}
+
return toAjax(i);
}
@@ -210,7 +204,7 @@
//获取当前更新用户信息
User sysUser = getSysUser();
- // todo-2023 此处最终核查
+ // todo-2024
hiddenDangerCheckPoint.setUpdateBy(ShiroUtils.getLoginName());
hiddenDangerCheckPoint.setUpdateTime(DateUtils.getNowDate());
hiddenDangerCheckPoint.setExamineCreateTime(DateUtils.getNowDate());//设置核查时间
--
Gitblit v1.9.2