From b20ea525a6593ddcc8990bc42117bd6f8e0718f9 Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Fri, 24 Sep 2021 09:12:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ReportDataController.java      | 20 -------------------
 .../resources/mapper/ReportDataMapper.xml     | 19 +++++++++++++-----
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java
index c07f1dd0..8dab6aed 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java
@@ -113,56 +113,36 @@ public class ReportDataController {
      */
     @GetMapping("/workShopPassRate")
     public R findWorkShopPassRate(@RequestParam(required = false) Map paramMap) {
-        try {
             paramMap.put("site", CommonMethods.getSite());
             List<Map<String, Object>> result = reportDataService.findWorkShopPassRate(paramMap);
             return R.ok(result);
-        } catch (Exception e) {
-            return R.failed(e.getMessage());
-        }
     }
 
     @GetMapping("/checkUserPassRate")
     public R findCheckUserPassRate(@RequestParam(required = false) Map paramMap) {
-        try {
             paramMap.put("site", CommonMethods.getSite());
             List<Map<String, Object>> result = reportDataService.findCheckUserPassRate(paramMap);
             return R.ok(result);
-        } catch (Exception e) {
-            return R.failed(e.getMessage());
-        }
     }
 
     @GetMapping("/userPassRate")
     public R findUserPassRate(@RequestParam(required = false) Map paramMap) {
-        try {
             paramMap.put("site", CommonMethods.getSite());
             List<Map<String, Object>> result = reportDataService.findUserPassRate(paramMap);
             return R.ok(result);
-        } catch (Exception e) {
-            return R.failed(e.getMessage());
-        }
     }
 
     @GetMapping("/inspectionDetailPassRate")
     public R findInspectionDetailPassRate(@RequestParam(required = false) Map paramMap) {
-        try {
             paramMap.put("site", CommonMethods.getSite());
             List<Map<String, Object>> result = reportDataService.findInspectionDetailPassRate(paramMap);
             return R.ok(result);
-        } catch (Exception e) {
-            return R.failed(e.getMessage());
-        }
     }
     @GetMapping("/sectionPassRate")
     public R findSectionPassRate(@RequestParam(required = false) Map paramMap) {
-        try {
             paramMap.put("site", CommonMethods.getSite());
             List<Map<String, Object>> result = reportDataService.findSectionPassRate(paramMap);
             return R.ok(result);
-        } catch (Exception e) {
-            return R.failed(e.getMessage());
-        }
     }
 
 
diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml
index 1e5f568a..e5816261 100644
--- a/common/src/main/resources/mapper/ReportDataMapper.xml
+++ b/common/src/main/resources/mapper/ReportDataMapper.xml
@@ -422,7 +422,9 @@
             AND TO_CHAR(zit.CREATED_DATE_TIME,'YYYY-MM') &lt;= #{startToDate}
         </if>
         GROUP BY zit."RESULT",zit.sfc ,zit.OPERATION,zit.STEP_ID, zit.CREATED_DATE_TIME,zit.RESRCE,zab.NC_QTY, WT.DESCRIPTION,ZSD.DISPATCH_QTY
-        ) GROUP BY DESCRIPTION, "MONTH"
+        )
+        WHERE SEQ='1'
+        GROUP BY DESCRIPTION, "MONTH"
         ORDER BY DESCRIPTION,"MONTH"
     </select>
 
@@ -455,8 +457,10 @@
                 AND ZIT.MODIFY_USER = #{userId}
             </if>
             GROUP BY zit."RESULT",zit.sfc ,zit.OPERATION,zit.STEP_ID, zit.CREATED_DATE_TIME,zit.RESRCE,zab.NC_QTY, ZNU.FULL_NAME,WT.DESCRIPTION
-            ) GROUP BY DESCRIPTION, "MONTH",FULL_NAME
-            ORDER BY DESCRIPTION,"MONTH"
+            )
+        WHERE SEQ='1'
+        GROUP BY DESCRIPTION, "MONTH",FULL_NAME
+        ORDER BY DESCRIPTION,"MONTH"
     </select>
 
     <select id="findUserPassRate" resultType="java.util.HashMap" parameterType="java.util.HashMap">
@@ -499,6 +503,7 @@
         GROUP BY zit."RESULT",zit.sfc ,zit.OPERATION,zit.STEP_ID, zit.CREATED_DATE_TIME,zit.RESRCE,zab.NC_QTY, WT.DESCRIPTION,ZSD.DISPATCH_QTY,E.EMPLOYEE,ZABD.DUTY_USER
         ) D
         LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = D.EMPLOYEE
+        WHERE SEQ='1'
         GROUP BY DESCRIPTION, "MONTH",ZNU.FULL_NAME,DUTY_USER
         ORDER BY DESCRIPTION,"MONTH"
     </select>
@@ -546,7 +551,9 @@
             AND CFA.VALUE LIKE '%'||#{workOrder}||'%'
         </if>
         GROUP BY ZABD.DUTY_USER,zsd.DISPATCH_QTY,ZABD.DUTY_DEPART,zit."RESULT",zit.sfc ,zit.OPERATION,zit.STEP_ID,CFA.VALUE,CFB.VALUE, zit.CREATED_DATE_TIME,zit.RESRCE,zab.NC_QTY,zit.CREATED_DATE_TIME, ZNU.FULL_NAME,WT.DESCRIPTION,I.ITEM,IT.DESCRIPTION,O.OPERATION,OT.DESCRIPTION,ZSD.EMPLOYEE,ZSD.EMPLOYEE_DESCRIPTION,zit.COMMENTS,zit.CATEGORY
-        ) GROUP BY DATE_TIME,DESCRIPTION,FULL_NAME,DUTY_USER,DUTY_DEPART,WORK_ORDER,ITEM_NUMBER,ITEM,ITEM_DESC,OPERATION,OPERATION_DESC,CATEGORY,EMPLOYEE,EMPLOYEE_DESCRIPTION,COMMENTS
+        )
+        WHERE SEQ='1'
+        GROUP BY DATE_TIME,DESCRIPTION,FULL_NAME,DUTY_USER,DUTY_DEPART,WORK_ORDER,ITEM_NUMBER,ITEM,ITEM_DESC,OPERATION,OPERATION_DESC,CATEGORY,EMPLOYEE,EMPLOYEE_DESCRIPTION,COMMENTS
     </select>
     <select id="findSectionPassRate" resultType="java.util.HashMap" parameterType="java.util.HashMap">
         SELECT  "SECTION","MONTH",sum(NG_QTY) NC_QTY, sum(OK_QTY) OK_QTY,sum(CHECK_QTY) CHECK_QTY,round(sum(OK_QTY)*100/sum(DISPATCH_QTY),2)||'% ' OK_RATE FROM
@@ -578,7 +585,9 @@
             AND TO_CHAR(zit.CREATED_DATE_TIME,'YYYY-MM') &lt;= #{startToDate}
         </if>
         GROUP BY zit."RESULT",zit.sfc ,zit.OPERATION,zit.STEP_ID, zit.CREATED_DATE_TIME,zit.RESRCE,zab.NC_QTY,ZSD.DISPATCH_QTY,CS1.VALUE
-        ) GROUP BY  "MONTH","SECTION"
+        )
+        WHERE SEQ='1'
+        GROUP BY  "MONTH","SECTION"
         ORDER BY "SECTION","MONTH"
     </select>
 </mapper>
\ No newline at end of file