From b1d4e4274cf08bbec6e0eb84271cd7d641cfc7e1 Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Thu, 18 Aug 2022 11:46:33 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=BF=9B=E5=BA=A6=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anomaly/service/impl/ReportServiceImpl.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java index 4257c6c8..62c1f758 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java @@ -668,20 +668,21 @@ public class ReportServiceImpl implements ReportService { projectGanttChartHashMap.put("start",startDate); // rate1 计划完成（深蓝色） String planRate = dateConvert(String.valueOf(abnormalQualityMap.get("endPlanDate"))); + if ((Float.valueOf(planRate) - Float.valueOf(startDate)) <= 0){ + projectGanttChartHashMap.put("rate1", String.valueOf(1.00)); + projectGanttChartHashMap.put("rate2", String.valueOf(0.00)); + projectGanttChartHashMap.put("rate3", String.valueOf(0.00)); + projectGanttChartHashMap.put("start", String.valueOf(0.00)); + projectGanttChartList.add(projectGanttChartHashMap); + continue; + } planRate = String.valueOf(Float.valueOf(planRate) - Float.valueOf(startDate)); if (Float.valueOf(planRate) < 1){ projectGanttChartHashMap.put("rate1", "1"); }else { - if ((Float.valueOf(planRate) - Float.valueOf(startDate)) < 0){ - projectGanttChartHashMap.put("rate1", String.valueOf(1.00)); - projectGanttChartHashMap.put("rate2", String.valueOf(0.00)); - projectGanttChartHashMap.put("rate3", String.valueOf(0.00)); - projectGanttChartHashMap.put("start", String.valueOf(0.00)); - continue; - }else { projectGanttChartHashMap.put("rate1", planRate); } - } + String rate = String.valueOf(abnormalQualityMap.get("rate")); if ((Float.valueOf(rate) * 0.7 - Float.valueOf(startDate)) < 0){ projectGanttChartHashMap.put("rate3",String.valueOf(0.00));