From 75ffa17189aff8cc9a8019cb881184e08b5858c2 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 24 Sep 2021 14:17:23 +0800
Subject: [PATCH] 更改派遣修改
---
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 200e042..3a6a90f 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
@@ -203,9 +203,20 @@
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);
//修改当前保安人员的派遣状态
@@ -220,7 +231,7 @@
//内网同步
String s1 =
"update blade_user set dispatch = " + "'" + user.getDispatch() + "'" +
- " " +"where id = " + "'" + user.getId() + "';"+
+ " " +"where id = " + "'" + user.getId() + "';" +
"update sys_dispatcher set dispatcherTime = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcher.getDispatchertime()) + "'" +
",dispatcher_unit_id = " + "'" + dispatcher.getDispatcherUnitId() + "'" +
",user_ids = " + "'" + dispatcher.getUserIds() + "'" +
--
Gitblit v1.9.3