From cc057177b2fb17aee9a173a6adbabdc578fd74c7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 10:30:44 +0800
Subject: [PATCH] 1.许可

---
 src/main/java/org/springblade/modules/equipage/controller/EquipageController.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 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..a16d2cf 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,user_id,num,purchase_time,type) " +
 					"values(" + "'" + equipage.getId() + "'" + "," +
 					"'" + equipage.getName() + "'" + "," +
 					"'" + equipage.getNumber() + "'" + "," +
@@ -93,7 +93,9 @@
 					"'" + new SimpleDateFormat("yyyy-MM-dd").format(equipage.getDateForProduction()) + "'" + "," +
 					"'" + equipage.getJurisdiction() + "'" + "," +
 					"'" + equipage.getUserId() + "'" + "," +
-					"'" +equipage.getNum() + "'" + ")";
+					"'" + equipage.getNum() + "'" + "," +
+					"'" + new SimpleDateFormat("yyyy-MM-dd").format(equipage.getPurchaseTime()) + "'" + "," +
+					"'" +equipage.getType() + "'" + ")";
 			FtpUtil.sqlFileUpload(s1);
 		}else {
 			//修改
@@ -110,6 +112,8 @@
 					",jurisdiction = " + "'" + equipage.getJurisdiction() + "'" +
 					",user_id = " + "'" + equipage.getUserId() + "'" +
 					",num = " + "'" + equipage.getNum() + "'" +
+					",purchase_time = " + "'" + equipage.getPurchaseTime() + "'" +
+					",type = " + "'" + equipage.getType() + "'" +
 					" " +"where id = " + "'" + equipage.getId() + "'";
 			FtpUtil.sqlFileUpload(s1);
 		}
@@ -161,7 +165,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