From 858ddcd71b737c1e2d9f9c1fb9d009209cb97b4e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 22 Feb 2024 16:47:26 +0800
Subject: [PATCH] 场所检查新增场所类型查询,安全自查查询调整,新增安全自查导出

---
 src/main/java/org/springblade/modules/taskPlaceRectification/excel/PlaceRectificationsExcel.java |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/springblade/modules/taskPlaceRectification/excel/PlaceRectificationsExcel.java b/src/main/java/org/springblade/modules/taskPlaceRectification/excel/PlaceRectificationsExcel.java
index 0c71ef7..c127f49 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/excel/PlaceRectificationsExcel.java
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/excel/PlaceRectificationsExcel.java
@@ -1,16 +1,13 @@
 package org.springblade.modules.taskPlaceRectification.excel;
 
-import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 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 io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springblade.modules.patrol.vo.PatrolRecordVO;
-import org.springblade.modules.place.vo.PlacePoiLabelVO;
-
-import java.util.List;
+import org.springblade.common.excel.ExcelDictConverter;
+import org.springblade.common.excel.ExcelDictItem;
+import org.springblade.common.excel.ExcelDictItemLabel;
 
 @Data
 @ColumnWidth(25)
@@ -18,13 +15,17 @@
 @ContentRowHeight(18)
 public class PlaceRectificationsExcel {
 	private static final long serialVersionUID = 1L;
-
-	@ExcelProperty( value = "场所类别")
+	@ExcelProperty( value = "场所类别",converter = ExcelDictConverter.class)
+	@ExcelDictItem(type = "nineType")
+	@ExcelDictItemLabel(type = "nineType")
 	private String nineType;
 
 	@ExcelProperty(value = "场所名称")
 	private String placeName;
 
+	@ExcelProperty(value = "社区名称")
+	private String communityName;
+
 	@ExcelProperty(value = "场所地址")
 	private String placeAddress;
 

--
Gitblit v1.9.3