From 91890bac76ab5652fd07f955ebec3564a91f8011 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 13 Jan 2022 08:50:15 +0800
Subject: [PATCH] 1. 公司注册新增注册,审核 2. 公司新增修改

---
 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