From 56c84cd7fb04407536eb0135162313029828a81f Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 11 十二月 2023 10:14:41 +0800
Subject: [PATCH] 暂时提交
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 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 db81ca5..7315f5e 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,19 +122,39 @@
}
/**
+ * 隐患核查--核查
+ */
+ @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不能为空");
@@ -143,20 +163,12 @@
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);
}
/**
--
Gitblit v1.9.2