From 8853292babb2ad94de4a3207966f1e83b767cd2d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 17 Sep 2023 16:38:34 +0800
Subject: [PATCH] 新增流程节点进程查询接口
---
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java | 126 ++++++++++++++++++++++++++++++-----------
1 files changed, 92 insertions(+), 34 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..ef84069 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;
@@ -40,18 +41,20 @@
import org.springblade.modules.dispatcher.vo.DispatcherVO;
import org.springblade.modules.exam.excel.ExamScoreExcel;
import org.springblade.modules.exam.excel.ExamScoreImporter;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
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;
import java.util.List;
/**
- * 控制器
+ * 控制器
*
* @author zhongrj
* @since 2021-07-07
@@ -63,6 +66,8 @@
public class DispatcherUnitController extends BladeController {
private final IDispatcherUnitService dispatcherUnitService;
+ private final IDispatcherService dispatcherService;
+ private final MyAsyncService myAsyncService;
/**
* 详情
@@ -95,6 +100,7 @@
/**
* 自定义树
+ *
* @param dispatcher
* @return
*/
@@ -124,41 +130,65 @@
* 新增或修改
*/
@PostMapping("/submit")
- public R submit(@Valid @RequestBody DispatcherUnit dispatcherUnit){
+ public R submit(@Valid @RequestBody DispatcherUnit dispatcherUnit) {
boolean status = false;
- if (null==dispatcherUnit.getId()) {
+ if (null == dispatcherUnit.getId()) {
dispatcherUnit.setCreateTime(new Date());
//新增
status = dispatcherUnitService.save(dispatcherUnit);
-
- //数据同步
- String s1 =
- "insert into sys_dispatcher_unit(id,name,dept_id,linkman,phone,jurisdiction,start_time,end_time,serve_type) " +
- "values(" + "'" + dispatcherUnit.getId() + "'" + "," +
- "'" + dispatcherUnit.getName() + "'" + "," +
- "'" + dispatcherUnit.getDeptId() + "'" + "," +
- "'" + dispatcherUnit.getLinkman() + "'" + "," +
- "'" + dispatcherUnit.getPhone() + "'" + "," +
- "'" + dispatcherUnit.getJurisdiction() + "'" + "," +
- "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcherUnit.getStartTime()) + "'" + "," +
- "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcherUnit.getEndTime()) + "'" + "," +
- "'" +dispatcherUnit.getServeType() + "'" + ")";
- FtpUtil.sqlFileUpload(s1);
- }else {
+ if (status) {
+ //数据同步
+ String s1 =
+ "insert into sys_dispatcher_unit(id,name,dept_id,linkman,phone,jurisdiction,create_time,start_time,end_time," +
+ "serve_type,security_linkman,cell,num,district) " +
+ "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() + "'" + "," +
+ "'" + dispatcherUnit.getSecurityLinkman() + "'" + "," +
+ "'" + dispatcherUnit.getCell() + "'" + "," +
+ "'" + dispatcherUnit.getNum() + "'" + "," +
+ "'" + dispatcherUnit.getDistrict() + "'" + ")";
+ myAsyncService.dataSync(s1);
+ }
+ } else {
//修改
status = dispatcherUnitService.updateById(dispatcherUnit);
- //内网同步
- String s1 =
+ //派遣记录修改合同时间
+ 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);
+ if (status) {
+ //内网同步
+ String s1 =
"update sys_dispatcher_unit set name = " + "'" + dispatcherUnit.getName() + "'" +
- ",dept_id = " + "'" + dispatcherUnit.getDeptId() + "'" +
- ",linkman = " + "'" + dispatcherUnit.getLinkman() + "'" +
- ",phone = " + "'" + dispatcherUnit.getPhone() + "'" +
- ",jurisdiction = " + "'" + dispatcherUnit.getJurisdiction() + "'" +
- ",start_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcherUnit.getStartTime()) + "'" +
- ",end_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcherUnit.getEndTime()) + "'" +
- ",serve_type = " + "'" + dispatcherUnit.getServeType() + "'" +
- " " +"where id = " + "'" + dispatcherUnit.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ ",dept_id = " + "'" + dispatcherUnit.getDeptId() + "'" +
+ ",linkman = " + "'" + dispatcherUnit.getLinkman() + "'" +
+ ",phone = " + "'" + dispatcherUnit.getPhone() + "'" +
+ ",jurisdiction = " + "'" + dispatcherUnit.getJurisdiction() + "'" +
+ ",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() + "'" +
+ ",district = " + "'" + dispatcherUnit.getDistrict() + "'" +
+ " " + "where id = " + "'" + dispatcherUnit.getId() + "'";
+ myAsyncService.dataSync(s1);
+ //内网同步派遣记录修改合同时间
+ String s2 =
+ "update sys_dispatcher set end_time = " + "'" + endTime + "'" + " " + "where dispatcher_unit_id = " + "'" + ids + "'";
+ myAsyncService.dataSync(s2);
+ }
}
return R.status(status);
}
@@ -169,19 +199,21 @@
*/
@PostMapping("/remove")
@ApiOperation(value = "删除", notes = "传入ids")
- public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids){
+ public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
//内网删除
List<Long> list = Func.toLongList(ids);
- list.forEach(id ->{
+ list.forEach(id -> {
//内网同步
String s1 = "delete from sys_dispatcher_unit where id = " + "'" + id + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
});
return R.status(dispatcherUnitService.removeByIds(Func.toLongList(ids)));
}
/**
* 导入派遣单位数据
+ *
* @param isCovered 1 覆盖 0不覆盖
* @return
*/
@@ -197,9 +229,35 @@
*/
@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"));
+ unitExcel.setServeType("***");
+ unitExcel.setSecurityLinkman("王老五");
+ unitExcel.setCell("13112341234");
+ unitExcel.setNum(10);
+ 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"));
+ 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