From f7115db7eb622bcd2dd4ec62ce6f2b380a46bc08 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 04 Dec 2021 14:50:52 +0800
Subject: [PATCH] 派遣，考试，工作汇报修改
---
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 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..bcd4cb9 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
@@ -96,6 +96,17 @@
}
/**
+ * APP-从业单位查询（派遣单位）
+ */
+ @GetMapping("/queryDispatcher")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入dispatcher")
+ public R<IPage<DispatcherVO>> queryDispatcher(DispatcherVO dispatcher, Query query) {
+ IPage<DispatcherVO> pages = dispatcherService.queryDispatcher(Condition.getPage(query), dispatcher);
+ return R.data(pages);
+ }
+
+ /**
* 新增
*/
@PostMapping("/save")
@@ -203,9 +214,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 +242,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() + "'" +
@@ -232,8 +254,10 @@
"update blade_user set dispatch = " + "'" + user1.getDispatch() + "'" +
" " +"where id = " + "'" + user1.getId() + "'";
FtpUtil.sqlFileUpload(s1);
+ }else {
+ //修改
+ status = dispatcherService.updateById(dispatcher);
}
-
}
return R.status(status);
}
--
Gitblit v1.9.3