From d4cb6034a5e05b7aa2fb4593f4c2b630be138ca1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 08 Nov 2021 19:43:58 +0800
Subject: [PATCH] 1.派遣批量新增,导入示例新增 2.社保缴纳修改,导入示例新增

---
 src/main/java/org/springblade/modules/dispatcher/excel/DispatcherUnitExcel.java |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/springblade/modules/dispatcher/excel/DispatcherUnitExcel.java b/src/main/java/org/springblade/modules/dispatcher/excel/DispatcherUnitExcel.java
index e6d27a4..c08b7d3 100644
--- a/src/main/java/org/springblade/modules/dispatcher/excel/DispatcherUnitExcel.java
+++ b/src/main/java/org/springblade/modules/dispatcher/excel/DispatcherUnitExcel.java
@@ -17,6 +17,7 @@
 package org.springblade.modules.dispatcher.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
@@ -38,33 +39,35 @@
 
 
 	@ColumnWidth(25)
-	@ExcelProperty("保安公司名称")
+	@ExcelProperty("保安公司名称*")
 	private String deptName;
 
 
 	@ColumnWidth(25)
-	@ExcelProperty("服务对象名称")
+	@ExcelProperty("服务对象名称*")
 	private String name;
 
 
 	@ColumnWidth(20)
-	@ExcelProperty("联系人")
+	@ExcelProperty("联系人*")
 	private String linkman;
 
 
 	@ColumnWidth(20)
-	@ExcelProperty("联系电话")
+	@ExcelProperty("联系电话*")
 	private String phone;
 
 
 	@ColumnWidth(20)
-	@ExcelProperty("合同开始时间")
-	private String startTime;
+	@ExcelProperty("合同开始时间*")
+	@DateTimeFormat("yyyy/MM/dd")
+	private Date startTime;
 
 
 	@ColumnWidth(20)
-	@ExcelProperty("合同结束时间")
-	private String endTime;
+	@ExcelProperty("合同结束时间*")
+	@DateTimeFormat("yyyy/MM/dd")
+	private Date endTime;
 
 
 }

--
Gitblit v1.9.3