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/ApsGasPipingRouteStat.java | 61 +++++++++++++++++++-----------
1 files changed, 39 insertions(+), 22 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 5f64df6..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
@@ -5,6 +5,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.springframework.data.annotation.Transient;
@@ -18,6 +19,7 @@
* @author hjy
* @date 2025-04-24
*/
+@EqualsAndHashCode(callSuper = true)
@Schema(description = "姘斾綋绠¤矾浜ц兘璐熻浇缁熻瀹炰綋绫�")
@Data
public class ApsGasPipingRouteStat extends BaseEntity
@@ -36,7 +38,7 @@
/** 宸ュ簭鍙� */
@Excel(name = "宸ュ簭鍙�")
@Schema(description = "宸ュ簭鍙�", type = "String")
- private String roadProcessNumber;
+ private BigDecimal roadProcessNumber;
/** 褰撳墠宸ュ簭鍙� */
@Excel(name = "褰撳墠宸ュ簭鍙�")
@@ -59,17 +61,18 @@
private BigDecimal processTotalTime;
/** 璁″垝寮�宸ユ棩 */
- @Excel(name = "璁″垝寮�宸ユ棩")
+ @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;
/** 宸ュ簭鍚嶇О */
@@ -97,7 +100,7 @@
@Schema(description = "璁捐浜ц兘", type = "BigDecimal")
private BigDecimal designCapacity;
- /** 璁捐浜ц兘 */
+ /** 涓撲笟 */
@Excel(name = "涓撲笟")
@Schema(description = "涓撲笟", type = "String")
private String major;
@@ -117,10 +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;
-
+
@Transient
private String searchStartDate;
@@ -130,22 +161,8 @@
@Transient
private String searchType;
- private Boolean warning;
-
- /** 璁㈠崟寮�宸ユ棩 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "璁㈠崟瀹屽伐鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- 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;
-
- @Excel(name = "宸ュ簭鍙�")
- private BigDecimal routeProcessNumber;
-
private Integer num;
+ private BigDecimal routeProcessNumber;
@Override
public String toString() {
--
Gitblit v1.9.3