From b5960d1968e007b91d4d33dd7cbb74f1b566f2c1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 24 May 2024 10:20:01 +0800
Subject: [PATCH] 到期时间修改
---
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 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 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());
}
--
Gitblit v1.9.3