From 7a4a03e2c1455ba7a7c6fa60702e350faf6e25bb Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期一, 26 五月 2025 14:13:42 +0800
Subject: [PATCH] 管路&气柜产能负载按日统计查不到数据时不返回空
---
aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java
index bf4573d..5394aae 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java
@@ -7,6 +7,7 @@
import org.apache.commons.lang3.builder.ToStringStyle;
import java.io.Serial;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -45,25 +46,25 @@
/** 鏍囧噯宸ユ椂-灏忔暟 */
@Excel(name = "鏍囧噯宸ユ椂-灏忔暟")
- private Float standardTime;
+ private BigDecimal standardTime;
/** 宸ュ簭璁″垝寮�濮嬫椂闂� */
- @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 palnStartDate;
/** 宸ュ簭璁″垝瀹屾垚鏃ユ湡 */
- @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 planCompleteDate;
/** 鍔犲伐鏁伴噺-灏忔暟 */
@Excel(name = "鍔犲伐鏁伴噺-灏忔暟")
- private Float processQty;
+ private BigDecimal processQty;
/** 搴熷純鏁伴噺 */
@Excel(name = "搴熷純鏁伴噺")
- private Float scrapQty;
+ private BigDecimal scrapQty;
/** 宸ュ簭鐘舵�� */
@Excel(name = "宸ュ簭鐘舵��")
@@ -85,7 +86,7 @@
this.id = id;
}
- public Long getId()
+ public Long getId()
{
return id;
}
@@ -140,12 +141,12 @@
return processName;
}
- public void setStandardTime(Float standardTime)
+ public void setStandardTime(BigDecimal standardTime)
{
this.standardTime = standardTime;
}
- public Float getStandardTime()
+ public BigDecimal getStandardTime()
{
return standardTime;
}
@@ -170,22 +171,22 @@
return planCompleteDate;
}
- public void setProcessQty(Float processQty)
+ public void setProcessQty(BigDecimal processQty)
{
this.processQty = processQty;
}
- public Float getProcessQty()
+ public BigDecimal getProcessQty()
{
return processQty;
}
- public void setScrapQty(Float scrapQty)
+ public void setScrapQty(BigDecimal scrapQty)
{
this.scrapQty = scrapQty;
}
- public Float getScrapQty()
+ public BigDecimal getScrapQty()
{
return scrapQty;
}
--
Gitblit v1.9.3