From 548c15acd182735a75fa8aa447e28645b6a36970 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 05 Jan 2022 09:25:47 +0800
Subject: [PATCH] 变更派遣修改，保安员年龄计算修改
---
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 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 7cbdb7f..dc4e0cf 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
@@ -65,6 +65,7 @@
public class DispatcherUnitController extends BladeController {
private final IDispatcherUnitService dispatcherUnitService;
+ private final IDispatcherService dispatcherService;
/**
* 详情
@@ -135,7 +136,8 @@
//数据同步
String s1 =
- "insert into sys_dispatcher_unit(id,name,dept_id,linkman,phone,jurisdiction,create_time,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,security_linkman,cell,num) " +
"values(" + "'" + dispatcherUnit.getId() + "'" + "," +
"'" + dispatcherUnit.getName() + "'" + "," +
"'" + dispatcherUnit.getDeptId() + "'" + "," +
@@ -145,11 +147,22 @@
"'" + 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() + "'" + ")";
+ "'" + dispatcherUnit.getServeType() + "'" + "," +
+ "'" + dispatcherUnit.getSecurityLinkman() + "'" + "," +
+ "'" + dispatcherUnit.getCell() + "'" + "," +
+ "'" +dispatcherUnit.getNum() + "'" + ")";
FtpUtil.sqlFileUpload(s1);
}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() + "'" +
@@ -160,8 +173,15 @@
",start_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcherUnit.getStartTime()) + "'" +
",end_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcherUnit.getEndTime()) + "'" +
",serve_type = " + "'" + dispatcherUnit.getServeType() + "'" +
+ ",security_linkman = " + "'" + dispatcherUnit.getSecurityLinkman() + "'" +
+ ",cell = " + "'" + dispatcherUnit.getCell() + "'" +
+ ",num = " + "'" + dispatcherUnit.getNum() + "'" +
" " +"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);
}
@@ -209,6 +229,10 @@
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"));
+ unitExcel.setServeType("***");
+ unitExcel.setSecurityLinkman("王老五");
+ unitExcel.setCell("13112341234");
+ unitExcel.setNum(10);
list.add(unitExcel);
DispatcherUnitExcel unitExcel1 = new DispatcherUnitExcel();
@@ -218,6 +242,10 @@
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"));
+ unitExcel1.setServeType("***");
+ unitExcel1.setSecurityLinkman("钱小七");
+ unitExcel1.setCell("13112341234");
+ unitExcel1.setNum(100);
list.add(unitExcel1);
ExcelUtil.export(response, "派遣单位数据导入模板"+ DateUtil.time(), "派遣单位数据表", list, DispatcherUnitExcel.class);
--
Gitblit v1.9.3