From 62eb499b0c969f246d3245d1429a97da4de1ce28 Mon Sep 17 00:00:00 2001
From: 钟日健 <arsn163@163.com>
Date: Mon, 01 Jun 2026 20:46:13 +0800
Subject: [PATCH] feat: 成绩查询增加年龄查询返回
---
src/main/java/org/springblade/modules/dispatcher/excel/DispatcherUnitExcel.java | 72 ++++++++++++++++++++++++++++--------
1 files changed, 56 insertions(+), 16 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..5f22979 100644
--- a/src/main/java/org/springblade/modules/dispatcher/excel/DispatcherUnitExcel.java
+++ b/src/main/java/org/springblade/modules/dispatcher/excel/DispatcherUnitExcel.java
@@ -17,10 +17,14 @@
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;
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;
@@ -37,39 +41,75 @@
private static final long serialVersionUID = 1L;
- @ColumnWidth(25)
- @ExcelProperty("保安公司名称")
+// @ColumnWidth(25)
+ @ExcelProperty("企业名称*")
private String deptName;
- @ColumnWidth(25)
- @ExcelProperty("服务对象名称")
+// @ColumnWidth(25)
+ @ExcelProperty("派遣单位名称*")
private String name;
-
- @ColumnWidth(20)
- @ExcelProperty("保安员派遣总数")
- private Integer num;
+ @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)
- @ExcelProperty("合同开始时间")
+// @ColumnWidth(20)
+ @ExcelProperty("合同开始时间*")
+ @DateTimeFormat("yyyy/MM/dd")
private Date startTime;
- @ColumnWidth(20)
- @ExcelProperty("合同结束时间")
+// @ColumnWidth(20)
+ @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