From d4d5f196cc42ef8cfe739de6ecd40f2d21a96e31 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期二, 29 四月 2025 09:45:57 +0800
Subject: [PATCH] 【UPDATE-BUGFIX】优化计算产能开始结束日期

---
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingRouteStat.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingRouteStat.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingRouteStat.java
index b3f47f1..076ac6d 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingRouteStat.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingRouteStat.java
@@ -2,6 +2,7 @@
 
 import com.aps.common.core.annotation.Excel;
 import com.aps.common.core.web.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -40,7 +41,7 @@
     /** 褰撳墠宸ュ簭鍙� */
     @Excel(name = "褰撳墠宸ュ簭鍙�")
     @Schema(description = "褰撳墠宸ュ簭鍙�", type = "String")
-    private String currentProcessNumber;
+    private BigDecimal currentProcessNumber;
 
     /** 鐢熶骇鏁伴噺 */
     @Excel(name = "鐢熶骇鏁伴噺")
@@ -129,6 +130,11 @@
     @Transient
     private String searchType;
 
+    /** 璁″垝瀹屾垚鏃� */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "璁″垝瀹屽伐鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date processPlanEndDay;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

--
Gitblit v1.9.3