From 045b55722b25ccc77d88671c5d6df309edb8a66d Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Tue, 22 Feb 2022 16:00:34 +0800
Subject: [PATCH] 1. 保安员新增异步推送数据至群访用户表 2. 会员标记接口新增,会员标记成功,则创建会员记录和会员题库记录(包含120道题目) 3. web 端考试开始,查询题目判断用户是否为会员,如果为会员则从会员题库获取当前人员的考试题目(从120道题中随机抽取60道)
---
src/main/java/org/springblade/modules/equipage/service/impl/EquipageServiceImpl.java | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 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..808a6c8 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
@@ -83,7 +83,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 +94,32 @@
//插入数据
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);
+ }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);
+ }
});
}
}
--
Gitblit v1.9.3