From 5e972eb9928c39b5abbdfd35e2a0aeff40876e7d Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 07 May 2024 17:23:16 +0800
Subject: [PATCH] 修改不成功问题
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/excel/QualityManageExcel.java | 81 ++++++++++++----------------------------
1 files changed, 24 insertions(+), 57 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/excel/QualityManageExcel.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/excel/QualityManageExcel.java
index 7b4be89..4703d1a 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/excel/QualityManageExcel.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/excel/QualityManageExcel.java
@@ -4,9 +4,12 @@
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 lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.util.Date;
@Data
@ColumnWidth(25)
@@ -32,15 +35,15 @@
@ExcelProperty("数据来源")
private String flag;
- //市(州)
- @ExcelProperty("市(州)")
- private String cityName;
+ //所在地点
+ @ExcelProperty("所在地点")
+ private String resLoc;
//县(区)
- @ExcelProperty("县(区)")
- private String countyName;
+ @ExcelProperty("管理行政区")
+ private String adName;
//注册登记号
@ExcelProperty("注册登记号")
@@ -50,63 +53,27 @@
@ExcelProperty("工程规模")
private String engScal;
- //是否有闸
- @ExcelProperty("是否有闸")
- private String isGate;
+ //校验规则名称
+ @ExcelProperty("校验规则名称")
+ private String ruleName;
+ //校验规则描述
+ @ExcelProperty("校验规则描述")
+ private String ruleDesc;
- //是否病险
- @ExcelProperty("是否病险")
- private String isDanger;
+ //校验结果描述
+ @ExcelProperty("校验结果描述")
+ private String proDesc;
- //实时水位
- @ExcelProperty("当前水位(m)")
- private String rz;
-
- //堰顶高程
- @ExcelProperty("堰顶高程(m)")
- private String tbWeirTopElevation;
-
- //主汛期限制水位
- @ExcelProperty("汛限水位(m)")
- private String tbFlseLimStag;
-
- //正常蓄水位
- @ExcelProperty("正常水位(m)")
- private String tbNormPoolStag;
-
-
- //控制运行水位
- @ExcelProperty("控制水位(m)")
- private String tbControlZ;
-
-
- //设计洪水位
- @ExcelProperty("设计水位(m)")
- private String tbDesFlStag;
-
-
- //校核洪水位
- @ExcelProperty("校核水位(m)")
- private String tbCheckFlStag;
-
-
- //坝顶高程
- @ExcelProperty("坝顶高程(m)")
- private String tbDamTopElevation;
-
- //死水位
- @ExcelProperty("死水位(m)")
- private String tbDeadStag;
-
- //校验时间
- @ExcelProperty("校验时间")
- private String createTime;
+ //校验结果描述
+ @ExcelProperty("数据结果")
+ private String val;
//备注
- @ExcelProperty("备注")
- @ColumnWidth(50)
- private String remark;
+ @ExcelProperty("校验时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
}
--
Gitblit v1.9.3