From dfc3caadc68ac140a515f23be6de02ebac53878e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 15 May 2024 17:57:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/excel/ImportPlaceExcel.java | 111 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 67 insertions(+), 44 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/excel/PlaceExcel.java b/src/main/java/org/springblade/modules/place/excel/ImportPlaceExcel.java
similarity index 69%
rename from src/main/java/org/springblade/modules/place/excel/PlaceExcel.java
rename to src/main/java/org/springblade/modules/place/excel/ImportPlaceExcel.java
index 518cf6e..8d52f90 100644
--- a/src/main/java/org/springblade/modules/place/excel/PlaceExcel.java
+++ b/src/main/java/org/springblade/modules/place/excel/ImportPlaceExcel.java
@@ -6,6 +6,7 @@
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;
@@ -19,55 +20,13 @@
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
-public class PlaceExcel implements Serializable {
+public class ImportPlaceExcel implements Serializable {
private static final long serialVersionUID = 2L;
/** 门牌地址编码 */
- @ExcelProperty( "门牌地址编码")
+ @ExcelProperty( "门牌地址编码*")
private String houseCode;
-
- /** 街道名称 */
- @ExcelProperty( "街道名称")
- private String streetName;
-
- /** 社区名称 */
- @ExcelProperty( "社区名称")
- private String communityName;
-
- /** 网格名称 */
- @ExcelProperty( "网格名称")
- private String gridName;
-
- /** 场所负责人 */
- @ColumnWidth(15)
- @ExcelProperty( "场所负责人")
- private String principal;
-
- /** 场所负责人联系电话 */
- @ColumnWidth(15)
- @ExcelProperty( "场所负责人联系电话")
- private String principalPhone;
-
- /** 企业法定代表 */
- @ColumnWidth(15)
- @ExcelProperty( "企业法定代表")
- private String legalPerson;
-
- /** 法定代表联系电话 */
- @ColumnWidth(15)
- @ExcelProperty( "法定代表联系电话")
- private String legalTel;
-
- /** 企业法定代表身份证号码 */
- @ColumnWidth(15)
- @ExcelProperty( "企业法定代表身份证号码")
- private String legalIdCard;
-
- /** 企业（店铺）名称 */
- @ColumnWidth(25)
- @ExcelProperty( "企业（店铺）名称")
- private String placeName;
/** 地址 */
@ColumnWidth(25)
@@ -84,11 +43,75 @@
@ExcelProperty( "纬度")
private String lat;
+ /** 街道名称 */
+ @ExcelProperty( "街道名称")
+ private String streetName;
+
+ /** 社区名称 */
+ @ExcelProperty( "社区名称")
+ private String communityName;
+
+ /** 网格名称 */
+ @ExcelProperty( "网格名称")
+ private String gridName;
+
+ /** 场所名称 */
+ @ColumnWidth(25)
+ @ExcelProperty( "场所名称*")
+ private String placeName;
+
+ /** 场所负责人 */
+ @ColumnWidth(15)
+ @ExcelProperty( "场所负责人")
+ private String principal;
+
+ /** 场所负责人联系电话 */
+ @ColumnWidth(15)
+ @ExcelProperty( "场所负责人联系电话")
+ private String principalPhone;
+
+ /** 场所负责人身份证号 */
+ @ColumnWidth(15)
+ @ExcelProperty( "场所负责人身份证号")
+ private String principalIdCard;
+
+ /** 企业法定代表 */
+ @ColumnWidth(15)
+ @ExcelProperty( "企业法定代表")
+ private String legalPerson;
+
+ /** 法定代表联系电话 */
+ @ColumnWidth(15)
+ @ExcelProperty( "法定代表联系电话")
+ private String legalTel;
+
+ /** 企业法定代表身份证号码 */
+ @ColumnWidth(15)
+ @ExcelProperty( "企业法定代表身份证号码")
+ private String legalIdCard;
+
/** 九小场所类型 */
@ExcelProperty( value = "九小场所类型",converter = ExcelDictConverter.class)
+ @ExcelDictItem(type = "nineType")
@ExcelDictItemLabel(type = "nineType")
private String nineType;
+ /** 阵地类型 */
+ @ExcelProperty( value = "阵地类型",converter = ExcelDictConverter.class)
+ @ExcelDictItem(type = "frontType")
+ @ExcelDictItemLabel(type = "frontType")
+ private String frontType;
+
+ /** 1：是 2：否 三级消防单位 */
+ @ExcelProperty("三级消防单位(是/否)")
+ private String threeFireProtection;
+
+ /** 无诈类别 */
+ @ExcelProperty(value = "无诈类别", converter = ExcelDictConverter.class)
+ @ExcelDictItem(type = "noExplosionCategory")
+ @ExcelDictItemLabel(type = "noExplosionCategory")
+ private String noExplosionCategory;
+
/** 标签分类代码 */
@ExcelProperty( "标签分类代码")
private String labelCode;
--
Gitblit v1.9.3