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 | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 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 66c3bb6..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,6 +30,7 @@
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;
@@ -40,7 +41,7 @@
import java.util.regex.Pattern;
/**
- * 服务实现类
+ * 服务实现类
*
* @author BladeX
* @since 2021-07-07
@@ -53,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
*/
@@ -76,6 +79,7 @@
/**
* 自定义树
+ *
* @param dispatcher
* @return
*/
@@ -86,6 +90,7 @@
/**
* 派遣导入
+ *
* @param data
* @param isCovered
*/
@@ -96,12 +101,12 @@
//派遣单位
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);
@@ -109,27 +114,27 @@
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.getSecurityLinkman()!=null && dispatcherUnitExcel.getSecurityLinkman()!=""){
+ if (dispatcherUnitExcel.getSecurityLinkman() != null && dispatcherUnitExcel.getSecurityLinkman() != "") {
dispatcherUnit.setSecurityLinkman(dispatcherUnitExcel.getSecurityLinkman());
}
- if (dispatcherUnitExcel.getCell()!=null && dispatcherUnitExcel.getCell()!=""){
+ if (dispatcherUnitExcel.getCell() != null && dispatcherUnitExcel.getCell() != "") {
dispatcherUnit.setCell(dispatcherUnitExcel.getCell());
}
- if (dispatcherUnitExcel.getServeType()!=null && dispatcherUnitExcel.getServeType()!=""){
+ if (dispatcherUnitExcel.getServeType() != null && dispatcherUnitExcel.getServeType() != "") {
dispatcherUnit.setServeType(dispatcherUnitExcel.getServeType());
}
- if (dispatcherUnitExcel.getNum()!=null){
+ if (dispatcherUnitExcel.getNum() != null) {
dispatcherUnit.setNum(dispatcherUnitExcel.getNum());
}
@@ -169,7 +174,8 @@
//数据同步
String s1 =
- "insert into sys_dispatcher_unit(id,name,dept_id,linkman,phone,create_time,start_time,end_time,serve_type,security_linkman,cell,num) " +
+ "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() + "'" + "," +
@@ -181,8 +187,9 @@
"'" + dispatcherUnit.getServeType() + "'" + "," +
"'" + dispatcherUnit.getSecurityLinkman() + "'" + "," +
"'" + dispatcherUnit.getCell() + "'" + "," +
- "'" + dispatcherUnit.getNum() + "'" + ")";
- FtpUtil.sqlFileUpload(s1);
+ "'" + dispatcherUnit.getNum() + "'" + "," +
+ "'" + dispatcherUnit.getDistrict() + "'" + ")";
+ myAsyncService.dataSync(s1);
});
}
}
--
Gitblit v1.9.3