From 7a867acb6c49c5d4774bdfa6be83043017176e39 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 03 Feb 2024 10:55:39 +0800
Subject: [PATCH] 导出优化
---
src/main/java/org/springblade/modules/taskPlaceRectification/excel/TaskPlaceRectificationExcel.java | 118 +++++++++++------------------------------------------------
1 files changed, 22 insertions(+), 96 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskPlaceRectification/excel/TaskPlaceRectificationExcel.java b/src/main/java/org/springblade/modules/taskPlaceRectification/excel/TaskPlaceRectificationExcel.java
index 6e68c5f..3ac8234 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/excel/TaskPlaceRectificationExcel.java
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/excel/TaskPlaceRectificationExcel.java
@@ -16,12 +16,16 @@
*/
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 com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springblade.common.excel.ExcelDictConverter;
+import org.springblade.common.excel.ExcelDictItemLabel;
import org.springblade.modules.patrol.vo.PatrolRecordVO;
import org.springblade.modules.place.vo.PlacePoiLabelVO;
@@ -40,121 +44,43 @@
@ContentRowHeight(18)
public class TaskPlaceRectificationExcel {
private static final long serialVersionUID = 1L;
- // @ExcelProperty( "备注")
+
+
@ExcelProperty(value = "隐患项目")
+ @ExcelIgnore
private List<PatrolRecordVO> patrolRecordVOList;
@ExcelProperty(value = "场所标签")
+ @ExcelIgnore
private List<PlacePoiLabelVO> placePoiLabelVOList ;
@ExcelProperty(value = "场所名称")
private String placeName;
@ExcelProperty(value = "场所地址")
- private String location;
+ private String addressName;
- @ExcelProperty(value = "负责人")
- private String principal;
-
- @ExcelProperty(value = "网格名称")
- private String gridName;
-
- @ExcelProperty(value = "负责人电话")
- private String principalPhone;
-
- @ExcelProperty(value = "街道名称")
- private String streetName;
-
- @ExcelProperty(value = "社区名称")
- private String communityName;
-
- @ExcelProperty(value = "法人")
- private String legalPerson;
-
- @ExcelProperty(value = "法人电话")
- private String legalTel;
-
- @ExcelProperty(value = "检查人名称")
- private String name;
-
- @ExcelProperty(value = "隐患数量")
- private Integer number;
-
- @ExcelProperty(value = "机构名称")
- private String deptName;
-
- @ExcelProperty(value = "九小场所类型 业务字典：nineType")
+ @ExcelProperty( value = "场所类别")
private String nineType;
- @ExcelProperty(value = "隐患问题")
+ @ExcelProperty(value = "存在安全隐患或违法行为")
private String hiddenDanger;
- @ExcelProperty(value = "不通过原因")
- private String reasonFailure;
+ @ExcelProperty(value = "是否下发《责令改正通知书》或是否处罚")
+ private String rectificationNoticeFlag;
- /** 任务状态： 1：待接收 2：审核中 3：审核通过 4：审核不通过 */
- @ExcelProperty(value = "状态 1：待审核 2：审核通过 3：审核不通过 4:待上报（场所负责人完善，由系统下发的任务）")
- private Integer status;
+ @ExcelProperty(value = "是否整改完毕")
+ private String rectificationFlag;
- /** 任务名称 */
- @ExcelProperty(value = "任务名称")
- private String taskName;
+ @ExcelProperty(value = "完成整改时限")
+ private String rectificationEndTime;
- /** 隐患内容 */
- @ExcelProperty(value = "隐患内容")
- private String remark;
+ @ExcelProperty(value = "检查时间")
+ private String createTime;
+
+ @ExcelProperty(value = "派出所名称")
+ private String deptName;
-
- /** 创建时间 */
- @ExcelProperty(value = "创建时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date createTime;
-
- /** 门牌地址编码 */
- @ExcelProperty(value = "门牌地址编码")
- private String houseCode;
-
- /** 是否下发整改通知： 1：否 2 ：是 */
- @ExcelProperty(value = "是否下发整改通知： 1：否 2 ：是 ")
- private Integer rectificationNoticeFlag;
-
- /** 整改截止时间 */
- @ExcelProperty(value = "整改截止时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date rectificationEndTime;
-
- /** 整改完成时间 */
- @ExcelProperty(value = "整改完成时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date rectificationCompleteTime;
-
- /** 是否整改完毕：1：否 2 ：是 */
- @ExcelProperty(value = "是否整改完毕：1：否 2 ：是")
- private Integer rectificationFlag;
-
- /** 是否处罚：1：否 2 ：是 */
- @ExcelProperty(value = "是否处罚：1：否 2 ：是")
- private Integer punishFlag;
-
- /** 派出所 */
- @ExcelProperty(value = "派出所")
- private String policeStation;
-
- /** 整改通知书地址 */
- @ExcelProperty(value = "整改通知书地址")
- private String rectificationNoticeImgUrl;
-
- /** 签名路径 */
- @ExcelProperty(value = "签名路径")
- private String signaturePath;
-
- /** 创建人 */
- @ExcelProperty(value = "创建人")
- private Long createUser;
-
- /** 照片 */
- @ExcelProperty(value = "照片")
- private String imageUrls;
}
--
Gitblit v1.9.3