From aed241a8552e6567bab1a055b6c25f7709530b3a Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 30 Aug 2021 11:07:09 +0800
Subject: [PATCH] 考试成绩导入，派遣记录查询，用户新增接口修改
---
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 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 35d5456..0756410 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
@@ -41,6 +41,7 @@
import java.text.SimpleDateFormat;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
/**
@@ -119,6 +120,32 @@
return R.status(dispatcherService.updateById(dispatcher));
}
+
+ /**
+ * 结束派遣
+ * @param dispatcher
+ */
+ @PostMapping("/over-dispatcher")
+ public R overDispatcher(@Valid @RequestBody Dispatcher dispatcher) {
+ dispatcher.setStatus(1);
+ Boolean status = dispatcherService.updateById(dispatcher);
+
+ //用户状态改变
+ User user = new User();
+ user.setId(Long.parseLong(dispatcher.getUserIds()));
+ user.setDispatch("1");
+
+ //内网同步
+ String s1 =
+ "update sys_dispatcher set status = " + "'" + dispatcher.getStatus() + "'" +
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'" +
+ " " +"where id = " + "'" + dispatcher.getId() + "';"+
+ "update blade_user set dispatch = " + "'" + user.getDispatch() + "'" +
+ " " +"where id = " + "'" + user.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ return R.status(status);
+ }
+
/**
* 新增或修改
*/
@@ -129,8 +156,12 @@
//List<String> list = Arrays.asList(dispatcher.getUserIds().split(","));
//计算派遣人数
//dispatcher.setNum(list.size());
+
boolean status = false;
if (dispatcher.getId()==null){
+ dispatcher.setCreateTime(new Date());
+ dispatcher.setStatus(0);
+
User user = new User();
user.setId(Long.parseLong(dispatcher.getUserIds()));
user.setDispatch("0");
@@ -141,18 +172,22 @@
//数据同步
String s1 =
- "insert into sys_dispatcher(id,dispatcherTime,dispatcher_unit_id,user_ids,end_time,dept_id,jurisdiction) " +
+ "insert into sys_dispatcher(id,dispatcherTime,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.getDispatcherUnitId() + "'" + "," +
"'" + dispatcher.getUserIds() + "'" + "," +
"'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcher.getEndTime()) + "'" + "," +
"'" + dispatcher.getDeptId() + "'" + "," +
- "'" +dispatcher.getJurisdiction() + "'" + ");" +
+ "'" + dispatcher.getJurisdiction() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dispatcher.getCreateTime()) + "'" + "," +
+ "'" +dispatcher.getStatus() + "'" + ");" +
"update blade_user set dispatch = " + "'" + user.getDispatch() + "'" +
" " +"where id = " + "'" + user.getId() + "'";
FtpUtil.sqlFileUpload(s1);
}else {
+ dispatcher.setUpdateTime(new Date());
+
//查询当前派遣记录
Dispatcher dispatcher1 = dispatcherService.getById(dispatcher.getId());
if (!dispatcher1.getUserIds().equals(dispatcher.getUserIds())){
@@ -179,6 +214,7 @@
",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() + "';"+
--
Gitblit v1.9.3