From 3222d83845148e2479af6aeb0f029def5f28f8b2 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Mar 2024 12:34:53 +0800
Subject: [PATCH] Merge branch 'jc' of http://s16s652780.51mypc.cn:49896/r/zhba_management_w_bf into jc
---
src/main/java/org/springblade/modules/dispatcher/excel/DispatcherUnitExcel.java | 52 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 39 insertions(+), 13 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 9798b8a..5f22979 100644
--- a/src/main/java/org/springblade/modules/dispatcher/excel/DispatcherUnitExcel.java
+++ b/src/main/java/org/springblade/modules/dispatcher/excel/DispatcherUnitExcel.java
@@ -22,6 +22,9 @@
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import lombok.Data;
+import org.springblade.common.excel.ExcelDictConverter;
+import org.springblade.common.excel.ExcelDictItem;
+import org.springblade.common.excel.ExcelDictItemLabel;
import java.io.Serializable;
import java.util.Date;
@@ -38,50 +41,73 @@
private static final long serialVersionUID = 1L;
- @ColumnWidth(25)
+// @ColumnWidth(25)
@ExcelProperty("企业名称*")
private String deptName;
- @ColumnWidth(25)
- @ExcelProperty("服务对象名称*")
+// @ColumnWidth(25)
+ @ExcelProperty("派遣单位名称*")
private String name;
+ @ExcelProperty("派遣单位地址*")
+ private String address;
- @ColumnWidth(20)
- @ExcelProperty("服务对象联系人*")
+
+
+ @ExcelProperty("经度")
+ private String longitude;
+
+ @ExcelProperty("纬度")
+ private String latitude;
+
+ @ExcelProperty("派遣单位所属辖区")
+ private String jurisdiction;
+
+ @ExcelProperty(value = "派遣单位类型*",converter = ExcelDictConverter.class)
+ @ExcelDictItemLabel(type = "dispatcherUnitType")
+ @ExcelDictItem(type = "dispatcherUnitType")
+ private String district;
+
+ @ExcelProperty(value = "派遣单位行业*",converter = ExcelDictConverter.class)
+ @ExcelDictItemLabel(type = "dispatchProfession")
+ @ExcelDictItem(type = "dispatchProfession")
+ private String profession;
+
+// @ColumnWidth(20)
+ @ExcelProperty("派遣单位联系人*")
private String linkman;
- @ColumnWidth(20)
- @ExcelProperty("服务对象联系电话*")
+// @ColumnWidth(20)
+ @ExcelProperty("派遣单位联系电话*")
private String phone;
- @ColumnWidth(20)
+// @ColumnWidth(20)
@ExcelProperty("合同开始时间*")
@DateTimeFormat("yyyy/MM/dd")
private Date startTime;
- @ColumnWidth(20)
+// @ColumnWidth(20)
@ExcelProperty("合同结束时间*")
@DateTimeFormat("yyyy/MM/dd")
private Date endTime;
- @ColumnWidth(20)
+// @ColumnWidth(20)
@ExcelProperty("保安服务类型")
private String serveType;
- @ColumnWidth(20)
+// @ColumnWidth(20)
@ExcelProperty("负责人*")
private String securityLinkman;
- @ColumnWidth(20)
+// @ColumnWidth(20)
@ExcelProperty("负责人联系电话*")
private String cell;
- @ColumnWidth(20)
+// @ColumnWidth(20)
@ExcelProperty("派遣保安员数*")
private Integer num;
--
Gitblit v1.9.3