From f274ea473d1ba857c8ac213fc43524b4e773cf71 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 22 五月 2025 16:24:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingRouteStat.java | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 insertions(+), 15 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 a803376..1a76989 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
@@ -61,17 +61,18 @@
private BigDecimal processTotalTime;
/** 璁″垝寮�宸ユ棩 */
- @Excel(name = "璁″垝寮�宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璁″垝寮�宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Schema(description = "璁″垝寮�宸ユ棩", type = "Date")
private Date processPlanStartDay;
/** 璁捐宸ユ椂 */
@Excel(name = "璁捐宸ユ椂")
- @Schema(description = "璁捐宸ユ椂", type = "Long")
- private Long designTimes;
+ @Schema(description = "璁捐宸ユ椂", type = "BigDecimal")
+ private BigDecimal designTimes;
/** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
- @Schema(description = "鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�", type = "String")
+ @Schema(description = "鍒犻櫎鏍囧織", type = "String")
private String delFlag;
/** 宸ュ簭鍚嶇О */
@@ -99,7 +100,7 @@
@Schema(description = "璁捐浜ц兘", type = "BigDecimal")
private BigDecimal designCapacity;
- /** 璁捐浜ц兘 */
+ /** 涓撲笟 */
@Excel(name = "涓撲笟")
@Schema(description = "涓撲笟", type = "String")
private String major;
@@ -119,13 +120,38 @@
@Schema(description = "鏃�", type = "String")
private String planStartDay;
+ /** 璁″垝瀹屾垚鏃� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璁″垝瀹屾垚鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Schema(description = "璁″垝瀹屾垚鏃�", type = "Date")
+ private Date processPlanEndDay;
+
+ /** 璁㈠崟璁″垝瀹屾垚鏃� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璁㈠崟璁″垝瀹屾垚鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Schema(description = "璁㈠崟璁″垝瀹屾垚鏃�", type = "Date")
+ private Date orderPlanEndDay;
+
+ /** 璀﹀憡 */
+ @Excel(name = "璀﹀憡")
+ @Schema(description = "璀﹀憡", type = "Boolean")
+ private Boolean warning;
+
+ /** 宸ュ巶 */
+ @Excel(name = "宸ュ巶")
+ @Schema(description = "宸ュ巶", type = "String")
+ private String plant;
+
+ /** 杞﹂棿 */
+ @Excel(name = "杞﹂棿")
+ @Schema(description = "杞﹂棿", type = "String")
+ private String workshop;
+
/** 鎵规鍙� */
@Excel(name = "鎵规鍙�")
+ @Schema(description = "鎵规鍙�", type = "String")
private String batchNumber;
-
- /** 宸ュ巶 */
- private String plant;
-
+
@Transient
private String searchStartDate;
@@ -135,14 +161,8 @@
@Transient
private String searchType;
- private Boolean warning;
private Integer num;
private BigDecimal routeProcessNumber;
- private Date orderPlanEndDay;
- /** 璁″垝瀹屾垚鏃� */
- @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() {
--
Gitblit v1.9.3