From 5fcdba1711fb45d7a4acc9685db97400e7a38862 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 19 Jul 2021 21:25:06 +0800
Subject: [PATCH] 巡逻路线绑定修改
---
src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.xml | 3 +++
src/main/java/org/springblade/modules/routeIn/service/IRouteinService.java | 2 +-
src/main/java/org/springblade/modules/routeIn/service/impl/RouteinServiceImpl.java | 4 ++--
src/main/java/org/springblade/modules/routeIn/controller/RouteinController.java | 4 ++--
src/main/java/org/springblade/modules/system/controller/UserController.java | 9 +++++----
src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.java | 2 +-
6 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/modules/routeIn/controller/RouteinController.java b/src/main/java/org/springblade/modules/routeIn/controller/RouteinController.java
index 48ae46d..892db21 100644
--- a/src/main/java/org/springblade/modules/routeIn/controller/RouteinController.java
+++ b/src/main/java/org/springblade/modules/routeIn/controller/RouteinController.java
@@ -204,10 +204,10 @@
* @return
*/
@PostMapping("/selectList")
- public R selectList(String routeName, HttpServletResponse response) {
+ public R selectList(String routeName,String id, HttpServletResponse response) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials", "true");
- return R.data(routeinService.selectList(routeName));
+ return R.data(routeinService.selectList(routeName,id));
}
}
diff --git a/src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.java b/src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.java
index e845beb..da6ad85 100644
--- a/src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.java
+++ b/src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.java
@@ -42,5 +42,5 @@
List<RouteinVO> tree();
void insertlx(Routein routein);
void updatelx(Integer id, String routeName, String regionId, String a, String rTime, String creatName, String remarks);
- List<RouteinVO> selectList(String routeName);
+ List<RouteinVO> selectList(String routeName,String id);
}
diff --git a/src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.xml b/src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.xml
index 238186a..6911df3 100644
--- a/src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.xml
+++ b/src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.xml
@@ -64,6 +64,9 @@
<if test="routeName!=null and routeName!=''">
and r.routeName like '%${routeName}%'
</if>
+ <if test="id!=null and id!=''">
+ AND d.snumber = #{id}
+ </if>
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/routeIn/service/IRouteinService.java b/src/main/java/org/springblade/modules/routeIn/service/IRouteinService.java
index 2797f3d..722e800 100644
--- a/src/main/java/org/springblade/modules/routeIn/service/IRouteinService.java
+++ b/src/main/java/org/springblade/modules/routeIn/service/IRouteinService.java
@@ -42,5 +42,5 @@
List<RouteinVO> tree();
void insertlx(Routein routein);
void updatelx(Integer id, String routeName, String regionId, String a, String rTime, String creatName, String remarks);
- List<RouteinVO> selectList(String routeName);
+ List<RouteinVO> selectList(String routeName,String id);
}
diff --git a/src/main/java/org/springblade/modules/routeIn/service/impl/RouteinServiceImpl.java b/src/main/java/org/springblade/modules/routeIn/service/impl/RouteinServiceImpl.java
index eef84e0..045e925 100644
--- a/src/main/java/org/springblade/modules/routeIn/service/impl/RouteinServiceImpl.java
+++ b/src/main/java/org/springblade/modules/routeIn/service/impl/RouteinServiceImpl.java
@@ -59,8 +59,8 @@
}
@Override
- public List<RouteinVO> selectList(String routeName) {
- return baseMapper.selectList(routeName);
+ public List<RouteinVO> selectList(String routeName,String id) {
+ return baseMapper.selectList(routeName,id);
}
}
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index e7ca5ce..9dbe2b7 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -225,11 +225,12 @@
public R update(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
- if (user.getOnline_status() == null || user.getOnline_status().equals("")){
- user.setOnline_status("0");
+ if (user.getExamination_type() == null || user.getExamination_type().equals("")){
+ user.setExamination_type("0");
}
- if (user.getWork_status() == null || user.getWork_status().equals("")){
- user.setWork_status("0");
+
+ if (user.getExamination_mx() == null || user.getExamination_mx().equals("")){
+ user.setExamination_mx("正常");
}
return R.status(userService.updateUser(user));
--
Gitblit v1.9.3