From 47de44163acf01673de84c68110c098c07cad320 Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Fri, 12 Aug 2022 16:44:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=B8=9A=E9=83=A8=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E7=9C=8B=E6=9D=BF=E6=95=B0=E6=8D=AE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anomaly/service/impl/ReportServiceImpl.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 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 05d9e0d8..2f78af41 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 @@ -612,7 +612,7 @@ public class ReportServiceImpl implements ReportService { result.put("userGroup", userGroup); List> abnormalQualityList = reportMapper.projectScheduleShow(userGroup); if (abnormalQualityList.size() > 20){ - abnormalQualityList = abnormalQualityList.subList(0, 19); + abnormalQualityList = abnormalQualityList.subList(0, 20); } //项目进度圆圈circle @@ -660,10 +660,21 @@ public class ReportServiceImpl implements ReportService { if (Float.valueOf(planRate) < 1){ projectGanttChartHashMap.put("rate1", "1"); }else { - projectGanttChartHashMap.put("rate1", String.valueOf(Float.valueOf(planRate) - Float.valueOf(startDate))); + 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")); - projectGanttChartHashMap.put("rate2",String.valueOf(Float.valueOf(rate) * 0.7 - Float.valueOf(startDate))); + 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);