事业部项目进度看板数据接口修改v2

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java

@@ -612,7 +612,7 @@ public class ReportServiceImpl implements ReportService {
         result.put("userGroup", userGroup);
         List<Map<String, String>> abnormalQualityList = reportMapper.projectScheduleShow(userGroup);
         if (abnormalQualityList.size() > 20){
-            abnormalQualityList = abnormalQualityList.subList(0, 19);
+            abnormalQualityList = abnormalQualityList.subList(0, 20);
         }
 
         //项目进度圆圈circle
@@ -659,11 +659,22 @@ public class ReportServiceImpl implements ReportService {
             String planRate = dateConvert(String.valueOf(abnormalQualityMap.get("endPlanDate")));
             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));
                 }else {
                     projectGanttChartHashMap.put("rate1", String.valueOf(Float.valueOf(planRate) - Float.valueOf(startDate)));
                 }
+            }
             String rate = String.valueOf(abnormalQualityMap.get("rate"));
+            if ((Float.valueOf(rate) * 0.7 - Float.valueOf(startDate)) < 0){
+                projectGanttChartHashMap.put("rate2",String.valueOf(0.00));
+            }else {
                 projectGanttChartHashMap.put("rate2",String.valueOf(Float.valueOf(rate) * 0.7 - Float.valueOf(startDate)));
+            }
             //String now = dateConvert(DateUtil.formatDate(new Date()));
             projectGanttChartHashMap.put("rate3",String.valueOf(Float.valueOf(abnormalQualityMap.get("planRate")) * 0.7  - Float.valueOf(startDate)));
             projectGanttChartList.add(projectGanttChartHashMap);