From 4ab2f03ca91ad9ae010a72b6fd0cacec7ea3fa09 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 11 九月 2023 13:51:52 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 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..db8c296 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,11 +122,34 @@
}
/**
+ * 隐患核查--核查
+ */
+ @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不能为空");
@@ -147,16 +170,11 @@
// 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