From 91579adf84fa8bada0eaefbccdf8fe6f6f7e70f5 Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Tue, 26 Jul 2022 18:17:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=80=BB=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/system/BroadDataMapper.xml         | 44 ++++++++++++-------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
index fd645fb..f265b10 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
@@ -319,24 +319,33 @@ FROM (select PLAN_NUMBER
 --           and  to_char(SCAN_TIME, 'yyyy-MM-dd') =to_char(SYSDATE, 'yyyy-MM-dd')
     </select>
     <select id="zhou_selectQaItemInfo" resultMap="MTKBeen">
-        select case
-                   when ITEM_CODE = '1001' then '成品检漏'
-                   when ITEM_CODE = '1002' then '内胆检漏'
-                   when ITEM_CODE = '1003' then '安全检测'
-                   when ITEM_CODE = '1005' then '测温性能'
-                   when ITEM_CODE = '1006' then '成品外观' end as code,
-               to_char(CREATION_DATE, 'MM-dd')        as name,
-               count(1)                                    as qty
-        from IMOS_QA_PRODUCT_QUALITY
-        where CREATION_DATE between (TRUNC(sysdate, 'D') + 1) and (TRUNC(sysdate, 'D') + 7)
-        group by ITEM_CODE, to_char(CREATION_DATE, 'MM-dd')
-        union
+select case
+           when ITEM_CODE = '1001' then '成品检漏'
+           when ITEM_CODE = '1002' then '内胆检漏'
+           when ITEM_CODE = '1003' then '安全检测'
+           when ITEM_CODE = '1005' then '测温性能'
+           when ITEM_CODE = '1006' then '成品外观' end as code,
+       to_char(CREATION_DATE, 'MM-dd')             as name,
+       round((CASE
+                  WHEN SUM(ALL_QTY) = 0 THEN 0.00
+                  ELSE (SUM(ALL_QTY) - SUM(H_Unqualified_Qty)) / SUM(ALL_QTY) END) *
+             100.00, 2)                            as rate
 
-        select '横坐标' as              code,
-               to_char(day, 'MM-dd') name,
-               0                     qty
-        from HAIWEI.BASE_PRODUCT_QTY
-        where DAY between (TRUNC(sysdate, 'D') + 1) and (TRUNC(sysdate, 'D') + 7)
+
+from view_imos_pr_barcode sqlwhere
+where CREATION_DATE between (TRUNC(sysdate, 'D') + 1) and (TRUNC(sysdate, 'D') + 7)
+
+  and ITEM_CODE in ('1001', '1002', '1003', '1005', '1006')
+group by ITEM_CODE, to_char(CREATION_DATE, 'MM-dd')
+
+
+union
+
+select '横坐标' as              code,
+       to_char(day, 'MM-dd') name,
+       0                     rate
+from HAIWEI.BASE_PRODUCT_QTY
+where DAY between (TRUNC(sysdate, 'D') + 1) and (TRUNC(sysdate, 'D') + 7)
     </select>
 
 
@@ -1090,6 +1099,7 @@ where DETIAL_TYPE_CODE = '1004'
     <resultMap id="BoxOutputBeen" type="com.ruoyi.system.domain.BoxOutput">
         <result column="name" property="name"/>
         <result column="qty" property="qty"/>
+        <result column="rate" property="rate"/>
     </resultMap>
     <select id="mtk_sselectQATop3" resultMap="MTKBeen">
         -- 1002,内胆预装检漏