update

lius

2023-08-11 a0b0e767a8260f9aab98d55153b7f78bcfd95eed

update

 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"));
@@ -1280,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 {
@@ -1311,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;
    }