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/service/impl/DispatcherUnitServiceImpl.java | 103 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 71 insertions(+), 32 deletions(-)
diff --git a/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java b/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
index 6695448..a858a58 100644
--- a/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
+++ b/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
@@ -30,15 +30,18 @@
import org.springblade.modules.dispatcher.vo.DispatcherUnitVO;
import org.springblade.modules.dispatcher.vo.DispatcherVO;
import org.springblade.modules.system.service.IUserDeptService;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.stereotype.Service;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
- * 服务实现类
+ * 服务实现类
*
* @author BladeX
* @since 2021-07-07
@@ -51,19 +54,21 @@
private final IDispatcherService dispatcherService;
private final IUserDeptService userDeptService;
+ private final MyAsyncService myAsyncService;
@Override
public IPage<DispatcherUnitVO> selectDispatcherUnitPage(IPage<DispatcherUnitVO> page, DispatcherUnitVO dispatcherUnitVO) {
List<DispatcherUnitVO> dispatcherUnitVOS = baseMapper.selectDispatcherUnitPage(page, dispatcherUnitVO);
dispatcherUnitVOS.forEach(dispatcherUnitVO1 -> {
//查询派遣记录条数
- dispatcherUnitVO1.setNum(dispatcherService.getDispatcherCount(dispatcherUnitVO1));
+ dispatcherUnitVO1.setSnum(dispatcherService.getDispatcherCount(dispatcherUnitVO1));
});
return page.setRecords(dispatcherUnitVOS);
}
/**
* 派遣公司信息详情
+ *
* @param dispatcherUnit 派遣信息对象
* @return
*/
@@ -74,6 +79,7 @@
/**
* 自定义树
+ *
* @param dispatcher
* @return
*/
@@ -84,6 +90,7 @@
/**
* 派遣导入
+ *
* @param data
* @param isCovered
*/
@@ -94,63 +101,95 @@
//派遣单位
DispatcherUnit dispatcherUnit = new DispatcherUnit();
//数据获取
- if (dispatcherUnitExcel.getDeptName()!=null && dispatcherUnitExcel.getDeptName()!=""){
+ if (dispatcherUnitExcel.getDeptName() != null && dispatcherUnitExcel.getDeptName() != "") {
String deptId = userDeptService.selectIn(dispatcherUnitExcel.getDeptName());
dispatcherUnit.setDeptId(Long.parseLong(deptId));
}
- if (dispatcherUnitExcel.getName()!=null && dispatcherUnitExcel.getName()!=""){
+ if (dispatcherUnitExcel.getName() != null && dispatcherUnitExcel.getName() != "") {
+ //仅中文
+// String chinese = "^[\\u4E00-\\u9FA5\\uF900-\\uFA2D]+$";
+// Pattern compile = Pattern.compile(chinese);
+// String name = compile.matcher(dispatcherUnitExcel.getName()).replaceAll("");
dispatcherUnit.setName(dispatcherUnitExcel.getName());
}
- if (dispatcherUnitExcel.getLinkman()!=null && dispatcherUnitExcel.getLinkman()!=""){
+ if (dispatcherUnitExcel.getLinkman() != null && dispatcherUnitExcel.getLinkman() != "") {
dispatcherUnit.setLinkman(dispatcherUnitExcel.getLinkman());
}
- if (dispatcherUnitExcel.getPhone()!=null && dispatcherUnitExcel.getPhone()!=""){
+ if (dispatcherUnitExcel.getPhone() != null && dispatcherUnitExcel.getPhone() != "") {
dispatcherUnit.setPhone(dispatcherUnitExcel.getPhone());
}
- if (dispatcherUnitExcel.getStartTime()!=null){
- String year = dispatcherUnitExcel.getStartTime().substring(0, 4);
- String month = dispatcherUnitExcel.getStartTime().substring(4, 6);
- String day = dispatcherUnitExcel.getStartTime().substring(6, 8);
- String dateFormat = year + "-" +month+"-" +day;
- try {
- Date date = new SimpleDateFormat("yyyy-MM-dd").parse(dateFormat);
- dispatcherUnit.setStartTime(date);
- } catch (ParseException e) {
- e.printStackTrace();
- }
+ if (dispatcherUnitExcel.getSecurityLinkman() != null && dispatcherUnitExcel.getSecurityLinkman() != "") {
+ dispatcherUnit.setSecurityLinkman(dispatcherUnitExcel.getSecurityLinkman());
}
- if (dispatcherUnitExcel.getEndTime()!=null){
- String year = dispatcherUnitExcel.getEndTime().substring(0, 4);
- String month = dispatcherUnitExcel.getEndTime().substring(4, 6);
- String day = dispatcherUnitExcel.getEndTime().substring(6, 8);
- String dateFormat = year + "-" +month+"-" +day;
- try {
- Date date = new SimpleDateFormat("yyyy-MM-dd").parse(dateFormat);
- dispatcherUnit.setEndTime(date);
- } catch (ParseException e) {
- e.printStackTrace();
- }
+ if (dispatcherUnitExcel.getCell() != null && dispatcherUnitExcel.getCell() != "") {
+ dispatcherUnit.setCell(dispatcherUnitExcel.getCell());
}
+
+ if (dispatcherUnitExcel.getServeType() != null && dispatcherUnitExcel.getServeType() != "") {
+ dispatcherUnit.setServeType(dispatcherUnitExcel.getServeType());
+ }
+
+ if (dispatcherUnitExcel.getNum() != null) {
+ dispatcherUnit.setNum(dispatcherUnitExcel.getNum());
+ }
+
+ dispatcherUnit.setStartTime(dispatcherUnitExcel.getStartTime());
+ dispatcherUnit.setEndTime(dispatcherUnitExcel.getEndTime());
+
+// if (dispatcherUnitExcel.getStartTime()!=null){
+// String year = dispatcherUnitExcel.getStartTime().substring(0, 4);
+// String month = dispatcherUnitExcel.getStartTime().substring(4, 6);
+// String day = dispatcherUnitExcel.getStartTime().substring(6, 8);
+// String dateFormat = year + "-" +month+"-" +day;
+// try {
+// Date date = new SimpleDateFormat("yyyy-MM-dd").parse(dateFormat);
+// dispatcherUnit.setStartTime(date);
+// } catch (ParseException e) {
+// e.printStackTrace();
+// }
+// }
+//
+// if (dispatcherUnitExcel.getEndTime()!=null){
+// String year = dispatcherUnitExcel.getEndTime().substring(0, 4);
+// String month = dispatcherUnitExcel.getEndTime().substring(4, 6);
+// String day = dispatcherUnitExcel.getEndTime().substring(6, 8);
+// String dateFormat = year + "-" +month+"-" +day;
+// try {
+// Date date = new SimpleDateFormat("yyyy-MM-dd").parse(dateFormat);
+// dispatcherUnit.setEndTime(date);
+// } catch (ParseException e) {
+// e.printStackTrace();
+// }
+// }
+
+ dispatcherUnit.setCreateTime(new Date());
//新增
this.save(dispatcherUnit);
//数据同步
String s1 =
- "insert into sys_dispatcher_unit(id,name,dept_id,linkman,phone,start_time,end_time) " +
+ "insert into sys_dispatcher_unit(id,name,dept_id,linkman,phone,create_time,start_time,end_time," +
+ "serve_type,security_linkman,cell,num,district) " +
"values(" + "'" + dispatcherUnit.getId() + "'" + "," +
"'" + dispatcherUnit.getName() + "'" + "," +
"'" + dispatcherUnit.getDeptId() + "'" + "," +
"'" + dispatcherUnit.getLinkman() + "'" + "," +
"'" + dispatcherUnit.getPhone() + "'" + "," +
- "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcherUnit.getStartTime()) + "'" + "," +
- "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcherUnit.getEndTime()) + "'" + ")";
- FtpUtil.sqlFileUpload(s1);
+ "'" + 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);
});
}
}
--
Gitblit v1.9.3