From dadf503b15f3423980ad2bc17d23ea1a444aca10 Mon Sep 17 00:00:00 2001 From: huangjiayang <5265313@qq.com> Date: 星期三, 14 五月 2025 17:48:00 +0800 Subject: [PATCH] 【UPDATE】修改mapper适配mybatis-plus --- aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingRouteStat.java | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 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..a803376 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,8 +2,10 @@ 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 lombok.EqualsAndHashCode; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.springframework.data.annotation.Transient; @@ -17,6 +19,7 @@ * @author hjy * @date 2025-04-24 */ +@EqualsAndHashCode(callSuper = true) @Schema(description = "姘斾綋绠¤矾浜ц兘璐熻浇缁熻瀹炰綋绫�") @Data public class ApsGasPipingRouteStat extends BaseEntity @@ -35,12 +38,12 @@ /** 宸ュ簭鍙� */ @Excel(name = "宸ュ簭鍙�") @Schema(description = "宸ュ簭鍙�", type = "String") - private String roadProcessNumber; + private BigDecimal roadProcessNumber; /** 褰撳墠宸ュ簭鍙� */ @Excel(name = "褰撳墠宸ュ簭鍙�") @Schema(description = "褰撳墠宸ュ簭鍙�", type = "String") - private String currentProcessNumber; + private BigDecimal currentProcessNumber; /** 鐢熶骇鏁伴噺 */ @Excel(name = "鐢熶骇鏁伴噺") @@ -58,8 +61,8 @@ private BigDecimal processTotalTime; /** 璁″垝寮�宸ユ棩 */ - @Excel(name = "璁″垝寮�宸ユ棩") - @Schema(description = "璁″垝寮�宸ユ棩", type = "Date") + @Excel(name = "璁″垝寮�宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date processPlanStartDay; /** 璁捐宸ユ椂 */ @@ -120,6 +123,9 @@ @Excel(name = "鎵规鍙�") private String batchNumber; + /** 宸ュ巶 */ + private String plant; + @Transient private String searchStartDate; @@ -129,6 +135,15 @@ @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() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) -- Gitblit v1.9.3