From 62eb499b0c969f246d3245d1429a97da4de1ce28 Mon Sep 17 00:00:00 2001
From: 钟日健 <arsn163@163.com>
Date: Mon, 01 Jun 2026 20:46:13 +0800
Subject: [PATCH] feat: 成绩查询增加年龄查询返回
---
src/main/java/org/springblade/modules/equipage/service/impl/EquipageServiceImpl.java | 56 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 16 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..d75e661 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) {
@@ -60,7 +62,7 @@
Equipage equipage = new Equipage();
//使用保安公司名称匹配组织机构id
if (null!=equipageExcel.getDeptName() && equipageExcel.getDeptName()!=""){
- equipage.setDeptId(Long.parseLong(userDeptService.selectIn(equipageExcel.getDeptName())));
+ equipage.setDeptId(userDeptService.selectIn(equipageExcel.getDeptName()));
}
if (null!=equipageExcel.getBrand() && equipageExcel.getBrand()!="") {
@@ -83,9 +85,17 @@
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) {
+ e.printStackTrace();
+ }
+ }
+
+ if (null!=equipageExcel.getReceiveDate() && !equipageExcel.getReceiveDate().equals("")) {
+ try {
+ equipage.setReceiveDate(new SimpleDateFormat("yyyy/MM/dd").parse(equipageExcel.getReceiveDate()));
} catch (ParseException e) {
e.printStackTrace();
}
@@ -94,20 +104,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