From 163ddeea6a82f16d0e72562d8a6656c106ed86bf Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Wed, 30 Nov 2022 15:14:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8(=E5=AE=A2=E6=88=B7=E7=BB=B4=E5=BA=A6)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anomaly/controller/ReportController.java  | 14 ++++++
 .../mesnac/anomaly/mapper/ReportMapper.java   |  7 +++
 .../mesnac/anomaly/service/ReportService.java |  6 +++
 .../service/impl/ReportServiceImpl.java       | 13 ++++++
 .../main/resources/mapper/ReportMapper.xml    | 46 ++++++++++++++++++-
 5 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
index 845d1b42..40597b3b 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
@@ -526,6 +526,20 @@ public class ReportController {
         }
     }
 
+    /**
+     * 项目齐套率报表
+     * @param
+     * @return
+     */
+    @GetMapping("/timeStatisticsCustomerReport")
+    public R timeStatisticsCustomerReport(@RequestParam(required = false) Map paramMap){
+        try {
+            return R.ok(reportService.timeStatisticsCustomerReport(paramMap));
+        } catch (Exception e) {
+            return R.failed(e.getMessage());
+        }
+    }
+
     /**
      *
      * 客户维度已完工工时报表
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
index 67616d8e..069f86fe 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
@@ -268,4 +268,11 @@ public interface ReportMapper {
      * @return
      */
     List<Map<String, String>> JJComponentProcessEfficiencyReport(Map paramMap);
+
+    /**
+     * 工时统计报表(客户维度)
+     * @param paramMap
+     * @return
+     */
+    List<Map<String, String>> timeStatisticsCustomerReport(Map paramMap);
 }
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java
index 741f58e9..b873eeaa 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java
@@ -279,4 +279,10 @@ public interface ReportService {
      */
     List<Map<String, String>> JJComponentProcessEfficiencyReport(Map paramMap);
 
+    /**
+     * 工时统计报表(客户维度)
+     * @param paramMap
+     * @return
+     */
+    List<Map<String, String>> timeStatisticsCustomerReport(Map paramMap);
 }
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 33a28c8f..f63795ae 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
@@ -1497,6 +1497,19 @@ public class ReportServiceImpl implements ReportService {
         return reportMapper.JJComponentProcessEfficiencyReport(paramMap);
     }
 
+    /**
+     * 工时统计报表(客户维度)
+     * @param paramMap
+     * @return
+     */
+    @Override
+    public List<Map<String, String>> timeStatisticsCustomerReport(Map paramMap) {
+        String site = CommonMethods.getSite();
+        paramMap.put("site", site);
+        paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage());
+        return reportMapper.timeStatisticsCustomerReport(paramMap);
+    }
+
     /**
      * 工时统计报表
      * @param paramMap
diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml
index 988a8a7f..0a8c9b26 100644
--- a/anomaly/src/main/resources/mapper/ReportMapper.xml
+++ b/anomaly/src/main/resources/mapper/ReportMapper.xml
@@ -2415,7 +2415,7 @@ SELECT zab.CREATED_DATE_TIME,
         LEFT JOIN Z_NWA_USER znu ON znu.USER_NAME = zab.CREATED_USER AND znu.SITE = zab.SITE
         LEFT JOIN Z_NWA_USER znu2 ON znu2.USER_NAME = zabd.RESOLVE_USER AND znu2.SITE = zab.SITE
         <where>
-            zab.SITE = #{site} AND zab."TYPE" ='Z'
+            zab.SITE = #{site} AND zab."TYPE" ='Z' AND zab.STATUS != 'Q'
             <if test="abnormalNo != null and abnormalNo != ''">
                 AND zab.ABNORMAL_NO = #{abnormalNo}
             </if>
@@ -2429,7 +2429,7 @@ SELECT zab.CREATED_DATE_TIME,
                 AND i.ITEM = #{item}
             </if>
             <if test="itemDescription != null and itemDescription != ''">
-                AND it.DESCRIPTION = #{itemDescription}
+                AND it.DESCRIPTION like '%${itemDescription}%'
             </if>
             <if test="productCategory != null and productCategory != ''">
                 AND (dflt.DATA_TAG = #{productCategory} OR
@@ -2852,4 +2852,46 @@ SELECT zab.CREATED_DATE_TIME,
         </if>
     </select>
 
+    <select id="timeStatisticsCustomerReport" resultType="java.util.Map" parameterType="java.util.HashMap">
+        --工时统计报表(客户维度)
+        SELECT ZWH."shortHandWorkOrder",
+               ROUND(SUM(ZWH."workHours"), 2) "totalWorkingHours"
+        FROM (
+                 SELECT cf2.VALUE           "workOrder",
+                        CASE
+                            WHEN INSTR(cf2.VALUE, '硫化') > 0 THEN '硫化'
+                            WHEN INSTR(cf2.VALUE, '全钢') > 0 THEN '全钢'
+                            WHEN INSTR(cf2.VALUE, '半钢') > 0 THEN '半钢'
+                            WHEN INSTR(cf2.VALUE, '鼓') > 0 THEN '鼓'
+                            WHEN INSTR(cf2.VALUE, '裁断') > 0 THEN '裁断'
+                            WHEN INSTR(cf2.VALUE, '检测') > 0 THEN '检测'
+                            WHEN INSTR(cf2.VALUE, '橡塑') > 0 THEN '橡塑'
+                            WHEN INSTR(cf2.VALUE, '非公路') > 0 THEN '非公路'
+                            WHEN INSTR(cf2.VALUE, '研究院') > 0 THEN '研究院'
+                            WHEN INSTR(cf2.VALUE, '粉体') > 0 THEN '粉体'
+                            ELSE '其他' END   "shortHandWorkOrder",
+                        SUM(CASE
+                                WHEN ZSD.DISPATCH_STATUS  = 'COMPLETE'
+                                    THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
+                                ELSE 0 END) "workHours"
+                 FROM Z_SFC_DISPATCH ZSD
+                          LEFT JOIN SHOP_ORDER so ON so.SHOP_ORDER = zsd.SHOP_ORDER AND so.SITE = zsd.SITE
+                          LEFT JOIN CUSTOM_FIELDS cf2 ON cf2.HANDLE = so.HANDLE AND cf2."ATTRIBUTE" = 'WORK_ORDER'
+                 WHERE 1 = 1
+        <if test="workOrder != null and workOrder != ''">
+            AND cf2.VALUE like '%${workOrder}%'
+        </if>
+        <if test="monthDate != null and monthDate != ''">
+            AND TO_CHAR((ZSD.ACTUAL_COMPLETE_DATE + 8 / 24),'yyyy-MM')  = #{monthDate}
+            AND TO_CHAR((ZSD.ACTUAL_COMPLETE_DATE + 8 / 24),'yyyy-MM') = #{monthDate}
+        </if>
+        <if test="yearDate != null and yearDate != ''">
+            AND TO_CHAR((ZSD.ACTUAL_COMPLETE_DATE + 8 / 24),'yyyy')  = #{yearDate}
+            AND TO_CHAR((ZSD.ACTUAL_COMPLETE_DATE + 8 / 24),'yyyy') = #{yearDate}
+        </if>
+                 GROUP BY cf2.VALUE) ZWH
+        GROUP BY ZWH."shortHandWorkOrder"
+        ORDER BY "totalWorkingHours" DESC
+    </select>
+
 </mapper>
\ No newline at end of file