From d65603650a5b9055f13f6406059c1f0cca471245 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 02 Jan 2024 10:14:41 +0800
Subject: [PATCH] 派遣统计接口、审核人信息

---
 src/main/java/org/springblade/modules/equipage/service/impl/EquipageServiceImpl.java |   66 ++++++++++++++++++--------------
 1 files changed, 37 insertions(+), 29 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 5c0f065..d75e661 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
@@ -62,7 +62,7 @@
 				Equipage equipage = new Equipage();
 				//使用保安公司名称匹配组织机构id
 				if (null!=equipageExcel.getDeptName() && equipageExcel.getDeptName()!=""){
-					equipage.setDeptId(Long.parseLong(userDeptService.selectIn(equipageExcel.getDeptName())));
+					equipage.setDeptId(userDeptService.selectIn(equipageExcel.getDeptName()));
 				}
 
 				if (null!=equipageExcel.getBrand() && equipageExcel.getBrand()!="") {
@@ -93,37 +93,45 @@
 					}
 				}
 
+				if (null!=equipageExcel.getReceiveDate() && !equipageExcel.getReceiveDate().equals("")) {
+					try {
+						equipage.setReceiveDate(new SimpleDateFormat("yyyy/MM/dd").parse(equipageExcel.getReceiveDate()));
+					} catch (ParseException e) {
+						e.printStackTrace();
+					}
+				}
+
 				//插入数据
 				this.save(equipage);
 
-				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);
-					myAsyncService.dataSync(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);
-					myAsyncService.dataSync(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);
+//					myAsyncService.dataSync(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);
+//					myAsyncService.dataSync(s1);
+//				}
 			});
 		}
 	}

--
Gitblit v1.9.3