From 01bff86104d7b0363688ce9b42bbe11f9e9548bf Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 15 Nov 2021 15:08:01 +0800
Subject: [PATCH] 1.派遣
---
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
index 494d05e..8d86c54 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
@@ -28,6 +28,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.dispatcher.entity.Dispatcher;
@@ -45,6 +46,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -63,6 +65,7 @@
public class DispatcherUnitController extends BladeController {
private final IDispatcherUnitService dispatcherUnitService;
+ private final IDispatcherService dispatcherService;
/**
* 详情
@@ -133,13 +136,14 @@
//数据同步
String s1 =
- "insert into sys_dispatcher_unit(id,name,dept_id,linkman,phone,jurisdiction,start_time,end_time,serve_type) " +
+ "insert into sys_dispatcher_unit(id,name,dept_id,linkman,phone,jurisdiction,create_time,start_time,end_time,serve_type) " +
"values(" + "'" + dispatcherUnit.getId() + "'" + "," +
"'" + dispatcherUnit.getName() + "'" + "," +
"'" + dispatcherUnit.getDeptId() + "'" + "," +
"'" + dispatcherUnit.getLinkman() + "'" + "," +
"'" + dispatcherUnit.getPhone() + "'" + "," +
"'" + dispatcherUnit.getJurisdiction() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dispatcherUnit.getCreateTime()) + "'" + "," +
"'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcherUnit.getStartTime()) + "'" + "," +
"'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcherUnit.getEndTime()) + "'" + "," +
"'" +dispatcherUnit.getServeType() + "'" + ")";
@@ -147,6 +151,14 @@
}else {
//修改
status = dispatcherUnitService.updateById(dispatcherUnit);
+ //派遣记录修改合同时间
+
+ Long id = dispatcherUnit.getId();
+ String ids=String.valueOf(id);
+ Date date = dispatcherUnit.getEndTime();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ String endTime = sdf.format(date);
+ dispatcherService.updateEndtime(endTime,ids);
//内网同步
String s1 =
"update sys_dispatcher_unit set name = " + "'" + dispatcherUnit.getName() + "'" +
@@ -159,6 +171,10 @@
",serve_type = " + "'" + dispatcherUnit.getServeType() + "'" +
" " +"where id = " + "'" + dispatcherUnit.getId() + "'";
FtpUtil.sqlFileUpload(s1);
+ //内网同步派遣记录修改合同时间
+ String s2 =
+ "update sys_dispatcher set end_time = " + "'" + endTime + "'" +" " + "where dispatcher_unit_id = " + "'" + ids + "'";
+ FtpUtil.sqlFileUpload(s2);
}
return R.status(status);
}
@@ -197,9 +213,27 @@
*/
@GetMapping("export-template")
@ApiOperation(value = "导出模板")
- public void exportUser(HttpServletResponse response) {
+ public void exportUser(HttpServletResponse response) throws ParseException {
List<DispatcherUnitExcel> list = new ArrayList<>();
- ExcelUtil.export(response, "派遣单位数据导入模板", "派遣单位数据表", list, DispatcherUnitExcel.class);
+ DispatcherUnitExcel unitExcel = new DispatcherUnitExcel();
+ unitExcel.setDeptName("****保安服务公司");
+ unitExcel.setName("****公司");
+ unitExcel.setLinkman("张三");
+ unitExcel.setPhone("13112341234");
+ unitExcel.setStartTime(new SimpleDateFormat("yyyy/MM/dd").parse("2020/5/1"));
+ unitExcel.setEndTime(new SimpleDateFormat("yyyy/MM/dd").parse("2021/5/1"));
+ list.add(unitExcel);
+
+ DispatcherUnitExcel unitExcel1 = new DispatcherUnitExcel();
+ unitExcel1.setDeptName("****保安服务公司");
+ unitExcel1.setName("****公司");
+ unitExcel1.setLinkman("李四");
+ unitExcel1.setPhone("13112341234");
+ unitExcel1.setStartTime(new SimpleDateFormat("yyyy/MM/dd").parse("2020/10/10"));
+ unitExcel1.setEndTime(new SimpleDateFormat("yyyy/MM/dd").parse("2021/10/10"));
+ list.add(unitExcel1);
+
+ ExcelUtil.export(response, "派遣单位数据导入模板"+ DateUtil.time(), "派遣单位数据表", list, DispatcherUnitExcel.class);
}
--
Gitblit v1.9.3