From 742e85018e2976590c6942a11e16023fadad19c9 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 23 Aug 2021 10:56:54 +0800
Subject: [PATCH] 保安异常查询接口修改
---
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java | 40 +++++++++++++++++++++++-----------------
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 2 +-
src/main/java/org/springblade/common/constant/FtpConstant.java | 7 ++++---
3 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/src/main/java/org/springblade/common/constant/FtpConstant.java b/src/main/java/org/springblade/common/constant/FtpConstant.java
index 91907ca..6977b4f 100644
--- a/src/main/java/org/springblade/common/constant/FtpConstant.java
+++ b/src/main/java/org/springblade/common/constant/FtpConstant.java
@@ -5,7 +5,7 @@
/**
* sql connect
*/
- String sql_connect_test = "jdbc:mysql://223.82.109.183:2083/zhba";
+// String sql_connect_dev = "jdbc:mysql://223.82.109.183:2083/zhba";
/**
* sql connect
@@ -13,7 +13,7 @@
String sql_connect_dev = "jdbc:mysql://localhost:3306/zhba";
//ftp服务器IP地址
- String ftpHost_test = "192.168.0.105";
+// String ftpHost_dev = "192.168.0.105";
//ftp服务器IP地址
String ftpHost_dev = "47.49.21.194";
@@ -35,5 +35,6 @@
/**
* 本地路径
*/
- String localPath = "/home/song/anbao";
+ String localPath = "/home/song/anbao/";
+// String localPath = "D:\\anbao\\";
}
diff --git a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
index b994696..c3b557f 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
@@ -99,7 +99,7 @@
public R save(@Valid @RequestBody Dispatcher dispatcher) {
if (null != dispatcher.getUserIds() && dispatcher.getUserIds() != "") {
//计算派遣人数
- dispatcher.setNum(Arrays.asList(dispatcher.getUserIds().split(",")).size());
+// dispatcher.setNum(Arrays.asList(dispatcher.getUserIds().split(",")).size());
//查询派遣单位的信息,设置行政区
dispatcher.setJurisdiction(dispatcherUnitService.getById(dispatcher.getDispatcherUnitId()).getJurisdiction().toString());
}
@@ -125,32 +125,38 @@
public R submit(@Valid @RequestBody Dispatcher dispatcher) {
if (dispatcher.getId()==null){
if (null!=dispatcher.getUserIds() && dispatcher.getUserIds()!=""){
- List<String> list = Arrays.asList(dispatcher.getUserIds().split(","));
- //计算派遣人数
- dispatcher.setNum(list.size());
+// List<String> list = Arrays.asList(dispatcher.getUserIds().split(","));
+// //计算派遣人数
+// dispatcher.setNum(list.size());
//修改保安人员的派遣状态
- list.forEach(id -> {
- User user = new User();
- user.setId(Long.parseLong(id));
- user.setDispatch("0");
- userService.updateById(user);
- });
+ User user = new User();
+ user.setId(Long.parseLong(dispatcher.getUserIds()));
+ user.setDispatch("0");
+ userService.updateById(user);
//查询派遣单位的信息,设置行政区
dispatcher.setJurisdiction(dispatcherUnitService.getById(dispatcher.getDispatcherUnitId()).getJurisdiction().toString());
}
}
else {
if (null != dispatcher.getUserIds() && dispatcher.getUserIds() != "") {
- List<String> list = Arrays.asList(dispatcher.getUserIds().split(","));
+// List<String> list = Arrays.asList(dispatcher.getUserIds().split(","));
//计算派遣人数
- dispatcher.setNum(list.size());
- //修改保安人员的派遣状态
- list.forEach(id -> {
+// dispatcher.setNum(list.size());
+ //查询当前派遣记录
+ Dispatcher dispatcher1 = dispatcherService.getById(dispatcher.getId());
+ if (!dispatcher1.getUserIds().equals(dispatcher.getUserIds())){
+ //修改原保安人员的派遣状态
User user = new User();
- user.setId(Long.parseLong(id));
- user.setDispatch("0");
+ user.setId(Long.parseLong(dispatcher1.getUserIds()));
+ user.setDispatch("1");
userService.updateById(user);
- });
+
+ //修改当前保安人员的派遣状态
+ User user1 = new User();
+ user1.setId(Long.parseLong(dispatcher.getUserIds()));
+ user1.setDispatch("0");
+ userService.updateById(user1);
+ }
//查询派遣单位的信息,设置行政区
dispatcher.setJurisdiction(dispatcherUnitService.getById(dispatcher.getDispatcherUnitId()).getJurisdiction().toString());
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 7fec3df..11acdb5 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -178,7 +178,7 @@
</if>
<if test="user.hold!=null and user.hold != ''">
and bu.hold = #{user.hold}
- </if> <if test="user.jurisdiction!=null and user.jurisdiction != ''">
+ </if> <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction != '1123598813738675201'">
and si.jurisdiction = #{user.jurisdiction}
</if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
--
Gitblit v1.9.3