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/controller/EquipageController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java b/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java
index a9d6881..1ac32e9 100644
--- a/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java
+++ b/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java
@@ -82,7 +82,7 @@
//数据推送
String s1 =
- "insert into sys_equipage(id,name,number,specifications,mode,dept_id,brand,date_for_production,jurisdiction,user_id,num) " +
+ "insert into sys_equipage(id,name,number,specifications,mode,dept_id,brand,date_for_production,jurisdiction,person_in_charge,num) " +
"values(" + "'" + equipage.getId() + "'" + "," +
"'" + equipage.getName() + "'" + "," +
"'" + equipage.getNumber() + "'" + "," +
@@ -92,7 +92,7 @@
"'" + equipage.getBrand() + "'" + "," +
"'" + new SimpleDateFormat("yyyy-MM-dd").format(equipage.getDateForProduction()) + "'" + "," +
"'" + equipage.getJurisdiction() + "'" + "," +
- "'" + equipage.getUserId() + "'" + "," +
+ "'" + equipage.getPersonInCharge() + "'" + "," +
"'" +equipage.getNum() + "'" + ")";
FtpUtil.sqlFileUpload(s1);
}else {
@@ -108,8 +108,8 @@
",brand = " + "'" + equipage.getBrand() + "'" +
",date_for_production = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(equipage.getDateForProduction()) + "'" +
",jurisdiction = " + "'" + equipage.getJurisdiction() + "'" +
- ",user_id = " + "'" + equipage.getUserId() + "'" +
",num = " + "'" + equipage.getNum() + "'" +
+ ",person_in_charge = " + "'" + equipage.getPersonInCharge() + "'" +
" " +"where id = " + "'" + equipage.getId() + "'";
FtpUtil.sqlFileUpload(s1);
}
@@ -161,7 +161,7 @@
*/
@GetMapping("export-template")
@ApiOperation(value = "导出模板")
- public void exportUser(HttpServletResponse response) {
+ public void exportEquipage(HttpServletResponse response) {
List<EquipageExcel> list = new ArrayList<>();
EquipageExcel equipage = new EquipageExcel();
equipage.setDeptName("***保安公司");
--
Gitblit v1.9.3