From f315cb9599bd6db3052e8fee019b9140474ea9ac Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 21 三月 2025 19:02:13 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/excel/ComplaintExcel.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/excel/ComplaintExcel.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/excel/ComplaintExcel.java
index a3e6279..4cdb267 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/excel/ComplaintExcel.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/excel/ComplaintExcel.java
@@ -1,6 +1,11 @@
package com.panzhihua.sangeshenbian.model.excel;
import cn.idev.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.format.DateTimeFormat;
+import com.panzhihua.sangeshenbian.annotation.TargetEnum;
+import com.panzhihua.sangeshenbian.conveter.EConverter;
+import com.panzhihua.sangeshenbian.enums.ComplaintExportEnum;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@@ -14,10 +19,10 @@
@Data
public class ComplaintExcel {
@ExcelProperty(value = "录入人")
- private String nickname;
+ private String reportUserName;
@ExcelProperty(value = "录入人联系方式")
- private String phone;
+ private String reportUserPhone;
@ExcelProperty(value = "群众姓名")
private String name;
@@ -26,6 +31,7 @@
private String contactNumber;
@ExcelProperty(value = "问题发生时间")
+ @DateTimeFormat("yyyy-MM-dd")
private Date time;
@ExcelProperty(value = "问题类型")
@@ -40,6 +46,7 @@
@ExcelProperty(value = "详细地址描述")
private String detailedAddress;
- @ExcelProperty(value = "流转状态：0-正在办理 1-延期办理 2-超时办理 3-已办结 4-群众撤销 5-上报待审核 6-上级驳回 7-延期待审核")
+ @ExcelProperty(value = "状态",converter = EConverter.class)
+ @TargetEnum(type = ComplaintExportEnum.class)
private Integer status;
}
--
Gitblit v1.7.1