From 345d17cf82e1bbc1fbfbeec10193c2bed59cd674 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 27 Sep 2021 22:21:21 +0800
Subject: [PATCH] 注册登录，车辆，装备，枪支，招聘，培训考试修改
---
src/main/java/org/springblade/modules/equipage/controller/EquipageController.java | 17 +++++++++++++----
1 files changed, 13 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 2b15d62..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,8 +161,17 @@
*/
@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("***保安公司");
+ equipage.setName("安全帽");
+ equipage.setMode("S10");
+ equipage.setNum(100);
+ equipage.setPersonInCharge("张三");
+ equipage.setBrand("***有限公司");
+ equipage.setDateForProduction("2021/05/01");
+ list.add(equipage);
ExcelUtil.export(response, "装备导入数据模板", "装备导入数据表", list, EquipageExcel.class);
}
--
Gitblit v1.9.3