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/ApsPlateStandardRequire.java | 67 +++++++++++++++++++-------------- 1 files changed, 38 insertions(+), 29 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 71e5891..379ccec 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,10 +2,13 @@ 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; import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; /** * 閽i噾宸ュ崟鏍囧噯闇�姹傚璞� aps_plate_standard_require @@ -21,14 +24,18 @@ 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") +// @Excel(name = "bom_line_id") private String bomLineId; /** 鏂欏彿 */ @@ -36,40 +43,43 @@ private String bomLineCode; /** BOM浣庨樁鐮� */ - @Excel(name = "BOM浣庨樁鐮�") +// @Excel(name = "浣庨樁鐮�") private Long bomLineLevel; /** BOM鐢ㄩ噺 */ - @Excel(name = "BOM鐢ㄩ噺") - private String bomUseAmount; +// @Excel(name = "BOM鐢ㄩ噺") + private BigDecimal bomUseAmount; /** 宸ヨ壓璺嚎ID */ - @Excel(name = "宸ヨ壓璺嚎ID") +// @Excel(name = "宸ヨ壓璺嚎ID") private String processRouteId; /** 宸ヨ壓璺嚎宸ユ椂 */ - @Excel(name = "宸ヨ壓璺嚎宸ユ椂") +// @Excel(name = "宸ヨ壓璺嚎宸ユ椂") private String processRouteHours; /** 闇�姹傛暟閲� */ - @Excel(name = "闇�姹傛暟閲�") - private String requireAmount; +// @Excel(name = "闇�姹傛暟閲�") + private BigDecimal requireAmount; /** 鍑�闇�姹傞噺 */ - @Excel(name = "鍑�闇�姹傞噺") - private String netRequirement; +// @Excel(name = "鍑�闇�姹傞噺") + private BigDecimal netRequirement; /** 璁″垝寮�宸ユ棩 */ - @Excel(name = "璁″垝寮�宸ユ棩") - private String startDate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "璁″垝寮�宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date startDate; /** 璁″垝瀹屽伐鏃� */ - @Excel(name = "璁″垝瀹屽伐鏃�") - private String completeDate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "璁″垝瀹屽伐鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date completeDate; /** 闇�姹傛棩鏈� */ - @Excel(name = "闇�姹傛棩鏈�") - private String demandDate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "闇�姹傛棩鏈�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date demandDate; /** 閫傜敤宸ュ巶 */ @Excel(name = "閫傜敤宸ュ巶") @@ -77,36 +87,35 @@ /** 鐢熶骇鍩哄湴 */ @Excel(name = "鐢熶骇鍩哄湴") - private String productionBase; /** 鍖归厤鐘舵�� */ - @Excel(name = "鍖归厤鐘舵��") - +// @Excel(name = "鍖归厤鐘舵��") private String matchState; /** 鍖归厤妯″紡 */ - @Excel(name = "鍖归厤妯″紡") - +// @Excel(name = "鍖归厤妯″紡") private String matchMode; /** 鏈尮閰嶉渶姹傛暟閲� */ @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