From dec8951aae400e54f6ee83a8f95867dba9da8af1 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 23 五月 2025 17:17:33 +0800
Subject: [PATCH] [钣金计划大表] 优化：焊缝统计导出Excel样式
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelinePrediction.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelinePrediction.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelinePrediction.java
index 4ebf861..4f60a7f 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelinePrediction.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelinePrediction.java
@@ -12,6 +12,7 @@
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -48,7 +49,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "棰勬祴鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "棰勬祴鏃ユ湡")
- private Timestamp predictDate;
+ private Date predictDate;
/** 鏁伴噺 */
@Excel(name = "鏁伴噺")
@@ -59,8 +60,9 @@
@TableField(exist = false)
private String key;
+ @JsonIgnore
public String getKey() {
- if (key == null) {
+ if (key == null && getPredictDate() != null) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
key = getFactory() + "##" + getMaterialCode() + "##" + sdf.format(getPredictDate());
}
--
Gitblit v1.9.3