From 410e73ecfe28f4794dfd3e48a3372bff1ba33c70 Mon Sep 17 00:00:00 2001 From: huangjiayang <5265313@qq.com> Date: 星期三, 14 五月 2025 11:18:31 +0800 Subject: [PATCH] 【UPDATE】修改系统管理相关基础功能模糊检索报错问题 --- aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java | 33 +++++++++++++++++++++------------ 1 files changed, 21 insertions(+), 12 deletions(-) diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java index adad153..315a4cd 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.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 lombok.Data; import lombok.EqualsAndHashCode; @@ -23,12 +24,16 @@ private static final long serialVersionUID = 1L; /** 闇�姹侷D */ + @JsonFormat(shape = JsonFormat.Shape.STRING) private Long id; /** 闇�姹傝拷婧疘D */ @Excel(name = "闇�姹傝拷婧疘D") - private String requireId; - + private String requireTrackId; + /**鍗曞彿*/ + private String docNum; + /**涓婄骇鐗╂枡缂栫爜*/ + private String bomHeaderCode; /** bom_line_id */ // @Excel(name = "bom_line_id") private String bomLineId; @@ -43,7 +48,7 @@ /** BOM鐢ㄩ噺 */ // @Excel(name = "BOM鐢ㄩ噺") - private String bomUseAmount; + private BigDecimal bomUseAmount; /** 宸ヨ壓璺嚎ID */ // @Excel(name = "宸ヨ壓璺嚎ID") @@ -55,21 +60,24 @@ /** 闇�姹傛暟閲� */ // @Excel(name = "闇�姹傛暟閲�") - private String requireAmount; + private BigDecimal requireAmount; /** 鍑�闇�姹傞噺 */ // @Excel(name = "鍑�闇�姹傞噺") - private String netRequirement; + private BigDecimal netRequirement; /** 璁″垝寮�宸ユ棩 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "璁″垝寮�宸ユ棩") private Date startDate; /** 璁″垝瀹屽伐鏃� */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "璁″垝瀹屽伐鏃�") private Date completeDate; /** 闇�姹傛棩鏈� */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "闇�姹傛棩鏈�") private Date demandDate; @@ -91,21 +99,22 @@ /** 鏈尮閰嶉渶姹傛暟閲� */ @Excel(name = "鏈尮閰嶉渶姹傛暟閲�") - private String unmatchedDemandAmount; + private BigDecimal unmatchedDemandAmount; /** 寤鸿瀹屾垚鏃ユ湡 */ -// @Excel(name = "寤鸿瀹屾垚鏃ユ湡") - private String suggestedCompletionDate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "寤鸿瀹屾垚鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date suggestedCompletionDate; /** 寤惰繜椋庨櫓鏍囪瘑 */ -// @Excel(name = "寤惰繜椋庨櫓鏍囪瘑") private String hasDelayRisk; - - /** $column.columnComment */ private String batchNumber; - /** $column.columnComment */ private String delFlag; + /**宸ュ崟鍒涘缓鏃堕棿*/ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "宸ュ崟鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date orderCreateTime; } -- Gitblit v1.9.3