From cbdf99e2c3be57e14f4e8162f76d7d48917a65f2 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 28 四月 2025 14:27:32 +0800
Subject: [PATCH] ApsResourceDateStat 更改类型
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java | 9 +++++----
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsResourceDateStat.java | 12 ++++++------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsResourceDateStat.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsResourceDateStat.java
index 5ea6181..b2c00e9 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsResourceDateStat.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsResourceDateStat.java
@@ -17,11 +17,11 @@
this.planDay = planDay;
}
- public Integer getDesignTimes() {
+ public BigDecimal getDesignTimes() {
return designTimes;
}
- public void setDesignTimes(Integer designTimes) {
+ public void setDesignTimes(BigDecimal designTimes) {
this.designTimes = designTimes;
}
@@ -33,11 +33,11 @@
this.resourceName = resourceName;
}
- public Integer getRequireTimes() {
+ public BigDecimal getRequireTimes() {
return requireTimes;
}
- public void setRequireTimes(Integer requireTimes) {
+ public void setRequireTimes(BigDecimal requireTimes) {
this.requireTimes = requireTimes;
}
@@ -59,8 +59,8 @@
private LocalDate planDay;
private String resourceName;
- private Integer requireTimes;
- private Integer designTimes;
+ private BigDecimal requireTimes;
+ private BigDecimal designTimes;
private BigDecimal capacityLoad;
private String resourceGroupName;
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java
index 68cffad..c7bf07f 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java
@@ -229,8 +229,9 @@
else {
ApsResourceDateStat empty = new ApsResourceDateStat();
empty.setPlanDay(LocalDate.parse(planDay, formatter));
- empty.setDesignTimes(resourceGroup.getDevicesQuantity().intValue()*resourceGroup.getTheoryHours().intValue());
- empty.setRequireTimes(0);
+ // empty.setDesignTimes(resourceGroup.getDevicesQuantity().intValue()*resourceGroup.getTheoryHours().intValue());
+ empty.setDesignTimes(resourceGroup.getTheoryHours().multiply(BigDecimal.valueOf( resourceGroup.getDevicesQuantity())));
+ empty.setRequireTimes(BigDecimal.ZERO);
empty.setResourceName(resourceName);
empty.setResourceGroupName(resourceName);
empty.setCapacityLoad(BigDecimal.ZERO);
@@ -302,8 +303,8 @@
dataRow.createCell(0).setCellValue(resourceName);
for (int j = 0; j < resourceDateStats.size(); j++) {
ApsResourceDateStat apsResourceDateStat = resourceDateStats.get(j);
- dataRow.createCell(j*3+1).setCellValue(apsResourceDateStat.getDesignTimes());
- dataRow.createCell(j*3+2).setCellValue(apsResourceDateStat.getRequireTimes());
+ dataRow.createCell(j*3+1).setCellValue(apsResourceDateStat.getDesignTimes().doubleValue());
+ dataRow.createCell(j*3+2).setCellValue(apsResourceDateStat.getRequireTimes().doubleValue());
dataRow.createCell(j*3+3).setCellValue(apsResourceDateStat.getCapacityLoad().doubleValue()+"%");
}
}
--
Gitblit v1.9.3