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/equipage/service/impl/EquipageServiceImpl.java | 46 +++++++++++++++++++++++++++++++---------------
1 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipage/service/impl/EquipageServiceImpl.java b/src/main/java/org/springblade/modules/equipage/service/impl/EquipageServiceImpl.java
index 300f481..5c0f065 100644
--- a/src/main/java/org/springblade/modules/equipage/service/impl/EquipageServiceImpl.java
+++ b/src/main/java/org/springblade/modules/equipage/service/impl/EquipageServiceImpl.java
@@ -13,6 +13,7 @@
import org.springblade.modules.equipage.vo.EquipageVo;
import org.springblade.modules.system.service.IUserDeptService;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +32,7 @@
private final IUserService userService;
private final IUserDeptService userDeptService;
+ private final MyAsyncService myAsyncService;
@Override
public IPage<EquipageVo> selectEquipagePage(IPage<EquipageVo> page, EquipageVo rquipage) {
@@ -83,7 +85,7 @@
equipage.setPersonInCharge(equipageExcel.getPersonInCharge());
}
- if (null!=equipageExcel.getDateForProduction() && equipageExcel.getDateForProduction()!="") {
+ if (null!=equipageExcel.getDateForProduction() && !equipageExcel.getDateForProduction().equals("")) {
try {
equipage.setDateForProduction(new SimpleDateFormat("yyyy/MM/dd").parse(equipageExcel.getDateForProduction()));
} catch (ParseException e) {
@@ -94,20 +96,34 @@
//插入数据
this.save(equipage);
-
- //数据推送
- String s1 =
- "insert into sys_equipage(id,name,mode,dept_id,person_in_charge,brand,date_for_production,num) " +
- "values(" + "'" + equipage.getId() + "'" + "," +
- "'" + equipage.getName() + "'" + "," +
- "'" + equipage.getMode() + "'" + "," +
- "'" + equipage.getDeptId() + "'" + "," +
- "'" + equipage.getPersonInCharge() + "'" + "," +
- "'" + equipage.getBrand() + "'" + "," +
- "'" + new SimpleDateFormat("yyyy/MM/dd").format(equipage.getDateForProduction()) + "'" + "," +
- "'" +equipage.getNum() + "'" + ")";
- FtpUtil.sqlFileUpload(s1);
-
+ if (null!=equipageExcel.getDateForProduction() && !equipageExcel.getDateForProduction().equals("")) {
+ //数据推送
+ String s1 =
+ "insert into sys_equipage(id,name,mode,dept_id,person_in_charge,brand,date_for_production,num) " +
+ "values(" + "'" + equipage.getId() + "'" + "," +
+ "'" + equipage.getName() + "'" + "," +
+ "'" + equipage.getMode() + "'" + "," +
+ "'" + equipage.getDeptId() + "'" + "," +
+ "'" + equipage.getPersonInCharge() + "'" + "," +
+ "'" + equipage.getBrand() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy/MM/dd").format(equipage.getDateForProduction()) + "'" + "," +
+ "'" + equipage.getNum() + "'" + ")";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ }else {
+ //数据推送
+ String s1 =
+ "insert into sys_equipage(id,name,mode,dept_id,person_in_charge,brand,num) " +
+ "values(" + "'" + equipage.getId() + "'" + "," +
+ "'" + equipage.getName() + "'" + "," +
+ "'" + equipage.getMode() + "'" + "," +
+ "'" + equipage.getDeptId() + "'" + "," +
+ "'" + equipage.getPersonInCharge() + "'" + "," +
+ "'" + equipage.getBrand() + "'" + "," +
+ "'" + equipage.getNum() + "'" + ")";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ }
});
}
}
--
Gitblit v1.9.3