From 7293f04d18fb2e882e152f962c3aa1d8fcb1f93e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 17 Nov 2021 15:46:35 +0800
Subject: [PATCH] 证书打印信息导出修改

---
 src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java |   60 +++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java b/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
index 87a456d..b6ff401 100644
--- a/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
+++ b/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
@@ -117,45 +117,51 @@
 				dispatcherUnit.setPhone(dispatcherUnitExcel.getPhone());
 			}
 
-			if (dispatcherUnitExcel.getStartTime()!=null){
-				String year = dispatcherUnitExcel.getStartTime().substring(0, 4);
-				String month = dispatcherUnitExcel.getStartTime().substring(4, 6);
-				String day = dispatcherUnitExcel.getStartTime().substring(6, 8);
-				String dateFormat = year + "-" +month+"-" +day;
-				try {
-					Date date = new SimpleDateFormat("yyyy-MM-dd").parse(dateFormat);
-					dispatcherUnit.setStartTime(date);
-				} catch (ParseException e) {
-					e.printStackTrace();
-				}
-			}
+			dispatcherUnit.setStartTime(dispatcherUnitExcel.getStartTime());
+			dispatcherUnit.setEndTime(dispatcherUnitExcel.getEndTime());
 
-			if (dispatcherUnitExcel.getEndTime()!=null){
-				String year = dispatcherUnitExcel.getEndTime().substring(0, 4);
-				String month = dispatcherUnitExcel.getEndTime().substring(4, 6);
-				String day = dispatcherUnitExcel.getEndTime().substring(6, 8);
-				String dateFormat = year + "-" +month+"-" +day;
-				try {
-					Date date = new SimpleDateFormat("yyyy-MM-dd").parse(dateFormat);
-					dispatcherUnit.setEndTime(date);
-				} catch (ParseException e) {
-					e.printStackTrace();
-				}
-			}
+//			if (dispatcherUnitExcel.getStartTime()!=null){
+//				String year = dispatcherUnitExcel.getStartTime().substring(0, 4);
+//				String month = dispatcherUnitExcel.getStartTime().substring(4, 6);
+//				String day = dispatcherUnitExcel.getStartTime().substring(6, 8);
+//				String dateFormat = year + "-" +month+"-" +day;
+//				try {
+//					Date date = new SimpleDateFormat("yyyy-MM-dd").parse(dateFormat);
+//					dispatcherUnit.setStartTime(date);
+//				} catch (ParseException e) {
+//					e.printStackTrace();
+//				}
+//			}
+//
+//			if (dispatcherUnitExcel.getEndTime()!=null){
+//				String year = dispatcherUnitExcel.getEndTime().substring(0, 4);
+//				String month = dispatcherUnitExcel.getEndTime().substring(4, 6);
+//				String day = dispatcherUnitExcel.getEndTime().substring(6, 8);
+//				String dateFormat = year + "-" +month+"-" +day;
+//				try {
+//					Date date = new SimpleDateFormat("yyyy-MM-dd").parse(dateFormat);
+//					dispatcherUnit.setEndTime(date);
+//				} catch (ParseException e) {
+//					e.printStackTrace();
+//				}
+//			}
+
+			dispatcherUnit.setCreateTime(new Date());
 
 			//新增
 			this.save(dispatcherUnit);
 
 			//数据同步
 			String s1 =
-				"insert into sys_dispatcher_unit(id,name,dept_id,linkman,phone,start_time,end_time) " +
+				"insert into sys_dispatcher_unit(id,name,dept_id,linkman,phone,create_time,start_time,end_time) " +
 					"values(" + "'" + dispatcherUnit.getId() + "'" + "," +
 					"'" + dispatcherUnit.getName() + "'" + "," +
 					"'" + dispatcherUnit.getDeptId() + "'" + "," +
 					"'" + dispatcherUnit.getLinkman() + "'" + "," +
 					"'" + dispatcherUnit.getPhone() + "'" + "," +
-					"'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcherUnit.getStartTime()) + "'" + "," +
-					"'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcherUnit.getEndTime()) + "'" + ")";
+					"'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dispatcherUnit.getCreateTime()) + "'" + "," +
+					"'" + new SimpleDateFormat("yyyy/MM/dd").format(dispatcherUnit.getStartTime()) + "'" + "," +
+					"'" + new SimpleDateFormat("yyyy/MM/dd").format(dispatcherUnit.getEndTime()) + "'" + ")";
 			FtpUtil.sqlFileUpload(s1);
 		});
 	}

--
Gitblit v1.9.3