From e4efff6637f4d598a7efdfca8b62fbb4c3286b02 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期四, 22 五月 2025 15:39:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelinePrediction.java | 3 ++-
1 files changed, 2 insertions(+), 1 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..6a23249 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
@@ -59,8 +59,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