From badd2b470f57a761d5c629a89f57aa8e91d85ed1 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期三, 21 五月 2025 12:11:46 +0800
Subject: [PATCH] 修改管路预测查询空日期格式化错误问题
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelinePredictionMapper.xml | 1 +
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelinePrediction.java | 3 ++-
aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialProductGroupManagementMapper.xml | 1 +
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialProductGroupManagement.java | 1 +
aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineMoMapper.xml | 1 +
5 files changed, 6 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());
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialProductGroupManagement.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialProductGroupManagement.java
index 001a28a..a51836c 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialProductGroupManagement.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialProductGroupManagement.java
@@ -60,6 +60,7 @@
@TableField(exist = false)
private String key;
+ @JsonIgnore
public String getKey() {
if (key == null) {
key = getFactory() + "##" + getMaterialCode();
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineMoMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineMoMapper.xml
index 0e1c12b..b9d9b9e 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineMoMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineMoMapper.xml
@@ -30,6 +30,7 @@
<if test="planEnd != null and planEnd != ''"> and plan_end = #{planEnd}</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
</where>
+ order by create_time desc
</select>
<select id="selectApsGasPipelineMoById" parameterType="Long" resultMap="ApsGasPipelineMoResult">
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelinePredictionMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelinePredictionMapper.xml
index b8c149a..5dd5657 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelinePredictionMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelinePredictionMapper.xml
@@ -28,6 +28,7 @@
<if test="predictDate != null and predictDate != ''"> and predict_date = #{predictDate}</if>
<if test="predictQuantity != null and predictQuantity != ''"> and predict_quantity = #{predictQuantity}</if>
</where>
+ order by create_time desc
</select>
<select id="selectApsGasPipelinePredictionById" parameterType="Long" resultMap="ApsGasPipelinePredictionResult">
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialProductGroupManagementMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialProductGroupManagementMapper.xml
index 73a5bd1..1714c80 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialProductGroupManagementMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialProductGroupManagementMapper.xml
@@ -30,6 +30,7 @@
<if test="isMain != null and isMain != ''"> and is_main = #{isMain}</if>
<if test="materialType != null and materialType != ''"> and material_type = #{materialType}</if>
</where>
+ order by create_time desc
</select>
<select id="selectApsMaterialProductGroupManagementById" parameterType="Long" resultMap="ApsMaterialProductGroupManagementResult">
--
Gitblit v1.9.3