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 bad92c87..846971d1 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 @@ -2007,32 +2007,17 @@ public class ReportServiceImpl implements ReportService { //近半年质量异常情况 HashMap abnormalQualityMap = new HashMap<>(); List dateList = new ArrayList<>(); + ArrayList abnormalQualityNumbers = new ArrayList<>(); + //获取近半年月份 - Calendar calendar = Calendar.getInstance(); - calendar.set(Calendar.MONTH,calendar.get(Calendar.MONTH) - 6); - for (int i = 6 ; i > 0; i--) { - calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) + 1); - dateList.add(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) == 0 ? 12 : calendar.get(Calendar.MONTH) < 10 ? "0" + calendar.get(Calendar.MONTH) : calendar.get(Calendar.MONTH))); - } - abnormalQualityMap.put("month",dateList); List> abnormalQualityList = reportMapper.abnormalQuality(user); - ArrayList abnormalQualityNumbers = new ArrayList<>(); - for (String date : dateList){ - boolean flag = true; - for (Map map : abnormalQualityList) { - if (map.get("DATE_TIME").equals(date)){ - abnormalQualityNumbers.add(map.get("NC_QTY")); - flag = false; - break; - } - } - if (flag){ - abnormalQualityNumbers.add(String.valueOf(0)); - } + for (Map map : abnormalQualityList) { + dateList.add(map.get("DATE_TIME")); + abnormalQualityNumbers.add(map.get("NC_QTY")); } + abnormalQualityMap.put("month",dateList); abnormalQualityMap.put("qualityNumbers",abnormalQualityNumbers); result.put("abnormalQuality",abnormalQualityMap); - return result; } diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index 52e7e6a2..9412315a 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -1273,8 +1273,9 @@