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));