From 1799f4a7988d52feb6230b6b140ef6ce1543b0f4 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Mon, 11 Sep 2023 14:19:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 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..0674dc4 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("/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")
+ public AjaxResult editNextConfirmSave(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