From bfd1cc53ada9190049a42bf57105554b0d6b13ef Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Wed, 11 Jan 2023 14:42:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=9C=8B=E6=9D=BF=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ReportServiceImpl.java       | 27 +++++--------------
 .../main/resources/mapper/ReportMapper.xml    | 10 ++++---
 2 files changed, 12 insertions(+), 25 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 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<String, Object> abnormalQualityMap = new HashMap<>();
         List<String> dateList = new ArrayList<>();
+        ArrayList<String> 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<Map<String, String>> abnormalQualityList = reportMapper.abnormalQuality(user);
-        ArrayList<String> abnormalQualityNumbers = new ArrayList<>();
-        for (String date : dateList){
-            boolean flag = true;
-            for (Map<String, String> 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<String, String> 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 @@
     </select>
     <select id="abnormalQuality" parameterType="java.util.HashMap" resultType="java.util.HashMap">
         --近半年质量异常情况
-        SELECT TO_CHAR(zab.CREATED_DATE_TIME,'yyyy-mm') DATE_TIME,
-        SUM(zab.NC_QTY) NC_QTY
+        SELECT * FROM (
+        SELECT TO_CHAR(zab.CREATED_DATE_TIME, 'yyyy-mm') DATE_TIME,
+        SUM(zab.NC_QTY)                           NC_QTY
         FROM Z_ABNORMAL_BILL zab
         WHERE zab.STATUS != 'Q'
         AND zab.NC_QTY IS NOT NULL
@@ -1282,8 +1283,9 @@
         <if test="user != null and user != ''">
             AND zab.WORK_ORDER like '%${user}%'
         </if>
-        GROUP BY TO_CHAR(zab.CREATED_DATE_TIME,'yyyy-mm')
-        ORDER BY DATE_TIME DESC
+        GROUP BY TO_CHAR(zab.CREATED_DATE_TIME, 'yyyy-mm')
+        ORDER BY DATE_TIME ASC )
+        WHERE 6 >= ROWNUM
     </select>
     <select id="projectScheduleShow" parameterType="java.util.HashMap" resultType="java.util.HashMap">
         --事业部项目进度看板数据接口