From a0b0e767a8260f9aab98d55153b7f78bcfd95eed Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期五, 11 八月 2023 14:50:15 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java | 61 ++++++++++++++++--------------
1 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
index 6bbaf58..b2adeef 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
@@ -657,23 +657,24 @@
mdcEfficiencyShiftResultDto.setColor(mdcUtilizationRate.getRateParameterColor());
}
}
- } else {
- mdcEfficiencyShiftResultDto.setTheDate(date);
- mdcEfficiencyShiftResultDto.setProcessLong(new BigDecimal("0"));
- mdcEfficiencyShiftResultDto.setUtilizationRate(new BigDecimal("0"));
- mdcEfficiencyShiftResultDto.setStartRate(new BigDecimal("0"));
- mdcEfficiencyShiftResultDto.setOpenRate(new BigDecimal("0"));
- mdcEfficiencyShiftResultDto.setOpenLong(new BigDecimal("0"));
- mdcEfficiencyShiftResultDto.setWaitLong(new BigDecimal("0"));
- mdcEfficiencyShiftResultDto.setCloseLong(new BigDecimal("0"));
- for (MdcUtilizationRate mdcUtilizationRate : mdcUtilizationRateList) {
- if (0 >= mdcUtilizationRate.getMinimumRange() && 0 < mdcUtilizationRate.getMaximumRange()) {
- mdcEfficiencyShiftResultDto.setColor(mdcUtilizationRate.getRateParameterColor());
- }
- }
}
}
} else {
+ mdcEfficiencyShiftResultDto.setTheDate(date);
+ mdcEfficiencyShiftResultDto.setProcessLong(new BigDecimal("0"));
+ mdcEfficiencyShiftResultDto.setUtilizationRate(new BigDecimal("0"));
+ mdcEfficiencyShiftResultDto.setStartRate(new BigDecimal("0"));
+ mdcEfficiencyShiftResultDto.setOpenRate(new BigDecimal("0"));
+ mdcEfficiencyShiftResultDto.setOpenLong(new BigDecimal("0"));
+ mdcEfficiencyShiftResultDto.setWaitLong(new BigDecimal("0"));
+ mdcEfficiencyShiftResultDto.setCloseLong(new BigDecimal("0"));
+ for (MdcUtilizationRate mdcUtilizationRate : mdcUtilizationRateList) {
+ if (0 >= mdcUtilizationRate.getMinimumRange() && 0 < mdcUtilizationRate.getMaximumRange()) {
+ mdcEfficiencyShiftResultDto.setColor(mdcUtilizationRate.getRateParameterColor());
+ }
+ }
+ }
+ if (StringUtils.isBlank(mdcEfficiencyShiftResultDto.getColor())) {
mdcEfficiencyShiftResultDto.setTheDate(date);
mdcEfficiencyShiftResultDto.setProcessLong(new BigDecimal("0"));
mdcEfficiencyShiftResultDto.setUtilizationRate(new BigDecimal("0"));
@@ -1177,6 +1178,7 @@
for (String date : dateList) {
Date startTime = DateUtils.toDate(date + " 00:00:00", DateUtils.STR_DATE_TIME_SMALL);
Date endTime = DateUtils.toDate(date + " 00:00:00", DateUtils.STR_DATE_TIME_SMALL);
+ endTime = DateUtils.addDays(endTime, 1);
list.add(this.utilizationRate(mdcEquDepDto.getEquipmentId(), mdcEquDepDto.getEquipmentName(), mdcEquDepDto.getEquipmentType(), startTime, endTime, date, mdcUtilizationRateList));
}
mdcEfficiencyListDto.setDataList(list);
@@ -1196,6 +1198,7 @@
for (String date : dateList) {
Date startTime = DateUtils.toDate(date + " 00:00:00", DateUtils.STR_DATE_TIME_SMALL);
Date endTime = DateUtils.toDate(date + " 00:00:00", DateUtils.STR_DATE_TIME_SMALL);
+ endTime = DateUtils.addDays(endTime, 1);
list.add(this.utilizationRate(mdcEquProDto.getEquipmentId(), mdcEquProDto.getEquipmentName(), mdcEquProDto.getEquipmentType(), startTime, endTime, date, mdcUtilizationRateList));
}
mdcEfficiencyListDto.setDataList(list);
@@ -1278,20 +1281,6 @@
mdcEfficiencyResultDto.setColor(mdcUtilizationRate.getRateParameterColor());
}
}
- } else {
- mdcEfficiencyResultDto.setTheDate(date);
- mdcEfficiencyResultDto.setProcessLong(new BigDecimal("0"));
- mdcEfficiencyResultDto.setUtilizationRate(new BigDecimal("0"));
- mdcEfficiencyResultDto.setStartRate(new BigDecimal("0"));
- mdcEfficiencyResultDto.setOpenRate(new BigDecimal("0"));
- mdcEfficiencyResultDto.setOpenLong(new BigDecimal("0"));
- mdcEfficiencyResultDto.setWaitLong(new BigDecimal("0"));
- mdcEfficiencyResultDto.setCloseLong(new BigDecimal("0"));
- for (MdcUtilizationRate mdcUtilizationRate : mdcUtilizationRateList) {
- if (0 >= mdcUtilizationRate.getMinimumRange() && 0 < mdcUtilizationRate.getMaximumRange()) {
- mdcEfficiencyResultDto.setColor(mdcUtilizationRate.getRateParameterColor());
- }
- }
}
}
} else {
@@ -1309,7 +1298,21 @@
}
}
}
-
+ if (StringUtils.isBlank(mdcEfficiencyResultDto.getColor())) {
+ mdcEfficiencyResultDto.setTheDate(date);
+ mdcEfficiencyResultDto.setProcessLong(new BigDecimal("0"));
+ mdcEfficiencyResultDto.setUtilizationRate(new BigDecimal("0"));
+ mdcEfficiencyResultDto.setStartRate(new BigDecimal("0"));
+ mdcEfficiencyResultDto.setOpenRate(new BigDecimal("0"));
+ mdcEfficiencyResultDto.setOpenLong(new BigDecimal("0"));
+ mdcEfficiencyResultDto.setWaitLong(new BigDecimal("0"));
+ mdcEfficiencyResultDto.setCloseLong(new BigDecimal("0"));
+ for (MdcUtilizationRate mdcUtilizationRate : mdcUtilizationRateList) {
+ if (0 >= mdcUtilizationRate.getMinimumRange() && 0 < mdcUtilizationRate.getMaximumRange()) {
+ mdcEfficiencyResultDto.setColor(mdcUtilizationRate.getRateParameterColor());
+ }
+ }
+ }
return mdcEfficiencyResultDto;
}
--
Gitblit v1.9.3