From 2c4f5f168f9436068bc2c17dc3f91c80e907a8bd Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期三, 20 三月 2024 16:22:38 +0800
Subject: [PATCH] 检索条件调整与部分注释调整
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java | 4 ++--
src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java | 2 +-
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerScheduleController.java | 2 +-
src/main/java/com/ruoyi/project/system/user/controller/LoginController.java | 3 +++
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java b/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java
index 1e9f9d0..232109e 100644
--- a/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java
+++ b/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java
@@ -193,7 +193,7 @@
try {
Map<String, String> map = new ObjectMapper().readValue(str, HashMap.class);
HiddenDangerCheckPoint hdcp = new ObjectMapper().readValue(str, HiddenDangerCheckPoint.class);
- // todo-2023 此处最终核查
+ // todo-2023
hdcp.setUpdateBy(header.loginName);
hdcp.setUpdateTime(DateUtils.getNowDate());
hdcp.setExamineCreateTime(DateUtils.getNowDate());//设置核查时间
diff --git a/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java b/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java
index cb84e8a..b126fdd 100644
--- a/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java
+++ b/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java
@@ -35,6 +35,9 @@
return "login";
}
+ /**
+ * 登录校验
+ * */
@PostMapping("/login")
@ResponseBody
public AjaxResult ajaxLogin(String username, String password, Boolean rememberMe)
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 7315f5e..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,7 +122,7 @@
}
/**
- * 隐患核查--核查
+ * 隐患核查--下一个核查人
*/
@Log(title = "隐患核查--核查")
@GetMapping("/editNextConfirm/{id}")
@@ -204,7 +204,7 @@
//获取当前更新用户信息
User sysUser = getSysUser();
- // todo-2023 此处最终核查
+ // todo-2024
hiddenDangerCheckPoint.setUpdateBy(ShiroUtils.getLoginName());
hiddenDangerCheckPoint.setUpdateTime(DateUtils.getNowDate());
hiddenDangerCheckPoint.setExamineCreateTime(DateUtils.getNowDate());//设置核查时间
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerScheduleController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerScheduleController.java
index 77648ea..12d0637 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerScheduleController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerScheduleController.java
@@ -156,7 +156,7 @@
}
startPage();
hiddenDangerCheck.setScheduleCheckUserId(getSysUser().getUserId());//排查人为本登录帐号userId的
- List<HiddenDangerCheck> list = hiddenDangerCheckService.selectHiddenDangerCheckList(hiddenDangerCheck);
+ List<HiddenDangerCheck> list = hiddenDangerCheckService.selectHiddenDangerCheckListNew(hiddenDangerCheck);
return getDataTable(list);
}
--
Gitblit v1.9.2