From 345d17cf82e1bbc1fbfbeec10193c2bed59cd674 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 27 Sep 2021 22:21:21 +0800
Subject: [PATCH] 注册登录，车辆，装备，枪支，招聘，培训考试修改
---
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
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 0756410..d3a5f7a 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
@@ -130,10 +130,24 @@
dispatcher.setStatus(1);
Boolean status = dispatcherService.updateById(dispatcher);
- //用户状态改变
+ //查询当前用户的派遣记录，是否存在多条未结束派遣的
+ Dispatcher dispatcher1 = new Dispatcher();
+ dispatcher1.setUserIds(dispatcher.getUserIds());
+ dispatcher1.setStatus(0);
+ List<Dispatcher> dispatcherList = dispatcherService.list(Condition.getQueryWrapper(dispatcher1));
+
User user = new User();
+ if (dispatcherList.size()<1){
+ //用户状态改变
+ user.setDispatch("1");
+ }else {
+ //用户状态改变
+ user.setDispatch("0");
+ }
user.setId(Long.parseLong(dispatcher.getUserIds()));
- user.setDispatch("1");
+ userService.updateById(user);
+
+
//内网同步
String s1 =
@@ -172,9 +186,10 @@
//数据同步
String s1 =
- "insert into sys_dispatcher(id,dispatcherTime,dispatcher_unit_id,user_ids,end_time,dept_id,jurisdiction,create_time,status) " +
+ "insert into sys_dispatcher(id,dispatcherTime,dispatcherAddress,dispatcher_unit_id,user_ids,end_time,dept_id,jurisdiction,create_time,status) " +
"values(" + "'" + dispatcher.getId() + "'" + "," +
"'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcher.getDispatchertime()) + "'" + "," +
+ "'" + dispatcher.getDispatcheraddress() + "'" + "," +
"'" + dispatcher.getDispatcherUnitId() + "'" + "," +
"'" + dispatcher.getUserIds() + "'" + "," +
"'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcher.getEndTime()) + "'" + "," +
@@ -188,13 +203,25 @@
}else {
dispatcher.setUpdateTime(new Date());
+
//查询当前派遣记录
Dispatcher dispatcher1 = dispatcherService.getById(dispatcher.getId());
if (!dispatcher1.getUserIds().equals(dispatcher.getUserIds())){
//修改原保安人员的派遣状态
+ //查询原保安人员的派遣记录，是否存在多条未结束派遣的
+ Dispatcher dispatcher2 = new Dispatcher();
+ dispatcher2.setUserIds(dispatcher1.getUserIds());
+ dispatcher2.setStatus(0);
+ List<Dispatcher> dispatcherList = dispatcherService.list(Condition.getQueryWrapper(dispatcher2));
User user = new User();
user.setId(Long.parseLong(dispatcher1.getUserIds()));
- user.setDispatch("1");
+ if (dispatcherList.size()<1){
+ //用户状态改变
+ user.setDispatch("1");
+ }else {
+ user.setDispatch("0");
+ }
+ //修改原保安人员用户信息
userService.updateById(user);
//修改当前保安人员的派遣状态
@@ -206,18 +233,20 @@
//修改
status = dispatcherService.updateById(dispatcher);
+
//内网同步
String s1 =
"update blade_user set dispatch = " + "'" + user.getDispatch() + "'" +
" " +"where id = " + "'" + user.getId() + "';"+
"update sys_dispatcher set dispatcherTime = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcher.getDispatchertime()) + "'" +
+ ",dispatcherAddress = " + "'" + dispatcher.getDispatcheraddress() + "'" +
",dispatcher_unit_id = " + "'" + dispatcher.getDispatcherUnitId() + "'" +
",user_ids = " + "'" + dispatcher.getUserIds() + "'" +
",end_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcher.getEndTime()) + "'" +
",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dispatcher.getUpdateTime()) + "'" +
",dept_id = " + "'" + dispatcher.getDeptId() + "'" +
",jurisdiction = " + "'" + dispatcher.getJurisdiction() + "'" +
- " " +"where id = " + "'" + user.getId() + "';"+
+ " " +"where id = " + "'" + dispatcher.getId() + "';"+
"update blade_user set dispatch = " + "'" + user1.getDispatch() + "'" +
" " +"where id = " + "'" + user1.getId() + "'";
FtpUtil.sqlFileUpload(s1);
--
Gitblit v1.9.3