From 2a64b537e8e3bce9ce030585a3da17d48379c0ad Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期一, 26 五月 2025 15:04:45 +0800
Subject: [PATCH] 修改json类型转换错误
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialManagement.java | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialManagement.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialManagement.java
index 8edb675..d9498c3 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialManagement.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialManagement.java
@@ -1,11 +1,13 @@
package com.aps.core.domain;
-import java.util.Date;
+import com.aps.common.core.annotation.Excel;
+import com.aps.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.aps.common.core.annotation.Excel;
-import com.aps.common.core.web.domain.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 鐗╂枡绠＄悊瀵硅薄 aps_material_management
@@ -18,7 +20,7 @@
private static final long serialVersionUID = 1L;
/** id */
- private String id;
+ private Long id;
/** 鏂欏彿 */
@Excel(name = "鏂欏彿")
@@ -50,7 +52,7 @@
/** 鏈�鏃╁彲鎻愬墠鐢熶骇澶╂暟 */
@Excel(name = "鏈�鏃╁彲鎻愬墠鐢熶骇澶╂暟")
- private String advanceProductionDays;
+ private BigDecimal advanceProductionDays;
/** 鎷嗗垎鎵归噺 */
@Excel(name = "鎷嗗垎鎵归噺")
@@ -69,26 +71,26 @@
private String applicableWorkshop;
/** 鐢熸晥鏃ユ湡 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鐢熸晥鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鐢熸晥鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date effectiveDate;
/** 澶辨晥鏃ユ湡 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "澶辨晥鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "澶辨晥鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expiringDate;
/** 闆嗘垚鏃ユ湡 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "闆嗘垚鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "闆嗘垚鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date integrationDate;
- public void setId(String id)
+ public void setId(Long id)
{
this.id = id;
}
- public String getId()
+ public Long getId()
{
return id;
}
@@ -163,12 +165,12 @@
return versionNumber;
}
- public void setAdvanceProductionDays(String advanceProductionDays)
+ public void setAdvanceProductionDays(BigDecimal advanceProductionDays)
{
this.advanceProductionDays = advanceProductionDays;
}
- public String getAdvanceProductionDays()
+ public BigDecimal getAdvanceProductionDays()
{
return advanceProductionDays;
}
--
Gitblit v1.9.3