From 8853292babb2ad94de4a3207966f1e83b767cd2d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 17 Sep 2023 16:38:34 +0800
Subject: [PATCH] 新增流程节点进程查询接口

---
 src/main/java/org/springblade/modules/dispatcher/excel/DispatcherUnitExcel.java |   36 +++++++++++++++++++++++++-----------
 1 files changed, 25 insertions(+), 11 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 ec82c16..9798b8a 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,38 +39,51 @@
 
 
 	@ColumnWidth(25)
-	@ExcelProperty("保安公司名称")
+	@ExcelProperty("企业名称*")
 	private String deptName;
 
 
 	@ColumnWidth(25)
-	@ExcelProperty("服务对象名称")
+	@ExcelProperty("服务对象名称*")
 	private String name;
 
 
 	@ColumnWidth(20)
-	@ExcelProperty("保安员派遣总数")
-	private Integer num;
-
-
-	@ColumnWidth(20)
-	@ExcelProperty("联系人")
+	@ExcelProperty("服务对象联系人*")
 	private String linkman;
 
 
 	@ColumnWidth(20)
-	@ExcelProperty("联系电话")
+	@ExcelProperty("服务对象联系电话*")
 	private String phone;
 
 
 	@ColumnWidth(20)
-	@ExcelProperty("合同开始时间")
+	@ExcelProperty("合同开始时间*")
+	@DateTimeFormat("yyyy/MM/dd")
 	private Date startTime;
 
 
 	@ColumnWidth(20)
-	@ExcelProperty("合同结束时间")
+	@ExcelProperty("合同结束时间*")
+	@DateTimeFormat("yyyy/MM/dd")
 	private Date endTime;
 
+	@ColumnWidth(20)
+	@ExcelProperty("保安服务类型")
+	private String serveType;
+
+	@ColumnWidth(20)
+	@ExcelProperty("负责人*")
+	private String securityLinkman;
+
+	@ColumnWidth(20)
+	@ExcelProperty("负责人联系电话*")
+	private String cell;
+
+	@ColumnWidth(20)
+	@ExcelProperty("派遣保安员数*")
+	private Integer num;
+
 
 }

--
Gitblit v1.9.3