From 70896e96f9903a316bb9e071300edbbbb23bd568 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Mon, 30 Jan 2023 16:51:20 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=B7=A5=E6=97=B6=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ReportServiceImpl.java       |  3 ++
 .../main/resources/mapper/ReportMapper.xml    | 38 +++++++++++++------
 2 files changed, 30 insertions(+), 11 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 846971d1..ade90da9 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
@@ -1475,11 +1475,14 @@ public class ReportServiceImpl implements ReportService {
         List<Map<String, String>>  thisYearMapList = reportMapper.totalWorkingHoursCompletedThisYear(workCenter);
         ArrayList<String> monthYearList = new ArrayList<>();
         ArrayList<Float> workHorsList = new ArrayList<>();
+        ArrayList<Float> planHorsList = new ArrayList<>();
         for (Map<String, String> map : thisYearMapList) {
             monthYearList.add(map.get("MONTH_MONTH"));
+            planHorsList.add(Float.valueOf(String.valueOf(map.get("PLAN_QTY"))));
             workHorsList.add(Float.valueOf(String.valueOf(map.get("QTY"))));
         }
         result.put("monthYearList",monthYearList);
+        result.put("planHorsList",planHorsList);
         result.put("workHorsList",workHorsList);
 
         //各车间总工时完成情况(单轴多折线图)
diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml
index eaad20ba..f14e43ab 100644
--- a/anomaly/src/main/resources/mapper/ReportMapper.xml
+++ b/anomaly/src/main/resources/mapper/ReportMapper.xml
@@ -3250,44 +3250,60 @@ SELECT zab.CREATED_DATE_TIME,
     </select>
     <select id="sixWorkCenterHoursQTY" resultType="java.util.LinkedHashMap">
         SELECT ceil(SUM(CASE
-                            WHEN ZSD.WORK_CENTER = 'JJ' AND (ZSD.DISPATCH_STATUS = 'COMPLETE' OR ZSD.DISPATCH_STATUS != 'CANCEL')
+                            WHEN ZSD.WORK_CENTER = 'JJ' AND
+                                 (ZSD.DISPATCH_STATUS = 'COMPLETE' OR ZSD.DISPATCH_STATUS = 'CANCEL') AND
+                                 (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= trunc(sysdate, 'yyyy') AND
+                                 (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) &lt;= last_day(add_months(trunc(SYSDATE, 'y'), 11))
                                 THEN ZSD.PROD_HOURS * ZSD.DISPATCH_QTY
                             ELSE 0 END)) JJ_DONE,
                ceil(SUM(CASE
-                            WHEN ZSD.WORK_CENTER = 'HJ' AND (ZSD.DISPATCH_STATUS = 'COMPLETE' OR ZSD.DISPATCH_STATUS != 'CANCEL')
+                            WHEN ZSD.WORK_CENTER = 'HJ' AND
+                                 (ZSD.DISPATCH_STATUS = 'COMPLETE' OR ZSD.DISPATCH_STATUS = 'CANCEL') AND
+                                 (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= trunc(sysdate, 'yyyy') AND
+                                 (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) &lt;= last_day(add_months(trunc(SYSDATE, 'y'), 11))
                                 THEN ZSD.PROD_HOURS * ZSD.DISPATCH_QTY
                             ELSE 0 END)) HJ_DONE,
                ceil(SUM(CASE
-                            WHEN ZSD.WORK_CENTER = 'RC' AND (ZSD.DISPATCH_STATUS = 'COMPLETE' OR ZSD.DISPATCH_STATUS != 'CANCEL')
+                            WHEN ZSD.WORK_CENTER = 'RC' AND
+                                 (ZSD.DISPATCH_STATUS = 'COMPLETE' OR ZSD.DISPATCH_STATUS = 'CANCEL') AND
+                                 (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= trunc(sysdate, 'yyyy') AND
+                                 (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) &lt;= last_day(add_months(trunc(SYSDATE, 'y'), 11))
                                 THEN ZSD.PROD_HOURS * ZSD.DISPATCH_QTY
                             ELSE 0 END)) RC_DONE,
                ceil(SUM(CASE
-                            WHEN ZSD.WORK_CENTER = 'JJ' AND (ZSD.DISPATCH_STATUS != 'CANCEL' AND ZSD.DISPATCH_STATUS != 'PAUSE' AND
-                                                ZSD.DISPATCH_STATUS != 'COMPLETE')
+                            WHEN ZSD.WORK_CENTER = 'JJ' AND
+                                 (ZSD.DISPATCH_STATUS != 'CANCEL' AND ZSD.DISPATCH_STATUS != 'PAUSE' AND
+                          ZSD.DISPATCH_STATUS != 'COMPLETE')
                                 THEN ZSD.PROD_HOURS * ZSD.DISPATCH_QTY
                             ELSE 0 END)) JJ_UNFINISD,
                ceil(SUM(CASE
-                            WHEN ZSD.WORK_CENTER = 'HJ' AND (ZSD.DISPATCH_STATUS != 'CANCEL' AND ZSD.DISPATCH_STATUS != 'PAUSE' AND
-                                                ZSD.DISPATCH_STATUS != 'COMPLETE')
+                            WHEN ZSD.WORK_CENTER = 'HJ' AND
+                                 (ZSD.DISPATCH_STATUS != 'CANCEL' AND ZSD.DISPATCH_STATUS != 'PAUSE' AND
+                          ZSD.DISPATCH_STATUS != 'COMPLETE')
                                 THEN ZSD.PROD_HOURS * ZSD.DISPATCH_QTY
                             ELSE 0 END)) HJ_UNFINISD,
                ceil(SUM(CASE
-                            WHEN ZSD.WORK_CENTER = 'RC' AND (ZSD.DISPATCH_STATUS != 'CANCEL' AND ZSD.DISPATCH_STATUS != 'PAUSE' AND
-                                                ZSD.DISPATCH_STATUS != 'COMPLETE')
+                            WHEN ZSD.WORK_CENTER = 'RC' AND
+                                 (ZSD.DISPATCH_STATUS != 'CANCEL' AND ZSD.DISPATCH_STATUS != 'PAUSE' AND
+                          ZSD.DISPATCH_STATUS != 'COMPLETE')
                                 THEN ZSD.PROD_HOURS * ZSD.DISPATCH_QTY
                             ELSE 0 END)) RC_UNFINISD
         FROM Z_SFC_DISPATCH ZSD
     </select>
     <select id="totalWorkingHoursCompletedThisYear" resultType="java.util.Map">
         WITH M_MONTH AS (
-            SELECT TO_CHAR(ADD_MONTHS(TRUNC(last_day(add_months(trunc(SYSDATE, 'y'), 11))), + ROWNUM - 12), 'yyyy-MM') MONTH
+            SELECT TO_CHAR(ADD_MONTHS(TRUNC(last_day(add_months(trunc(SYSDATE, 'y'), 11))), + ROWNUM - 24), 'yyyy-MM') MONTH
             FROM DUAL
         CONNECT BY 12 >= ROWNUM)
         SELECT SUBSTR(M_MONTH.MONTH, 6) || '月' MONTH_MONTH,
                SUM(ROUND(CASE
                              WHEN M_MONTH.MONTH = TO_CHAR(ZSD.ACTUAL_COMPLETE_DATE + 8 / 24, 'yyyy-mm') THEN
                                  ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
-                             ELSE 0 END, 2))   QTY
+                             ELSE 0 END, 2))   QTY,
+               SUM(ROUND(CASE
+                             WHEN M_MONTH.MONTH = TO_CHAR(ZSD.PLANNED_START_DATE + 8 / 24, 'yyyy-mm') THEN
+                                 ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
+                             ELSE 0 END, 2))   PLAN_QTY
         FROM Z_SFC_DISPATCH ZSD
                  CROSS JOIN M_MONTH
         GROUP BY M_MONTH.MONTH