From e9ffe6131daa1f7d2403e81f30c3bd863cccd591 Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Sat, 23 Jul 2022 14:57:22 +0800
Subject: [PATCH 1/2] =?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

---
 .../src/main/resources/mapper/system/BroadDataMapper.xml     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
index eb3fcbb..ea89918 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
@@ -516,7 +516,10 @@ from (
         values (#{name},#{nowOut},#{cha},#{zs})
     </insert>
     <select id="selectTeamGroups" resultType="integer">
-        select case when sysdate &lt; = W_END then 0 else 1 end from BASE_DAY_WBTIME where ROWNUM=1 order by CREATE_TIME desc
+        select case when sysdate &lt; = W_END then 0 else 1 end
+        from (select *
+        from (select w_end from BASE_DAY_WBTIME BASE_DAY_WBTIME  order by CREATE_TIME desc)
+        where ROWNUM = 1)
     </select>
 
 

From 4cb7f5921311f7984f098c8a54ac86bf1063b828 Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Sat, 23 Jul 2022 15:03:17 +0800
Subject: [PATCH 2/2] =?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

---
 .../main/java/com/ruoyi/system/mapper/BroadDataMapper.java  | 6 +++---
 .../java/com/ruoyi/system/service/IBroadDataService.java    | 6 +++---
 .../com/ruoyi/system/service/impl/BroadDataServiceImpl.java | 6 +++---
 .../src/main/resources/mapper/system/BroadDataMapper.xml    | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java
index 4e21c51..2a5737d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java
@@ -86,9 +86,9 @@ public interface BroadDataMapper {
 
     BoxOutput zz_selectOneBadRateMb();
 
-    List<OrderInfo> mtk_selectOrderInfoBy3d();
+    List<BoxOutput> mtk_selectOrderInfoBy3d();
 
-    List<OrderInfo> mtk_selectOrderInfoBy3dTatle();
+    List<BoxOutput> mtk_selectOrderInfoBy3dTatle();
 
-    List<OrderInfo> mtk_selectInstoreNumByday();
+    List<BoxOutput> mtk_selectInstoreNumByday();
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java
index 65ecd49..0ef965c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java
@@ -68,9 +68,9 @@ public interface IBroadDataService {
 
     BoxOutput zz_selectOneBadRateMb();
 
-    List<OrderInfo> mtk_selectOrderInfoBy3d();
+    List<BoxOutput> mtk_selectOrderInfoBy3d();
 
-    List<OrderInfo> mtk_selectOrderInfoBy3dTatle();
+    List<BoxOutput> mtk_selectOrderInfoBy3dTatle();
 
-    List<OrderInfo>  zz_selectInstoreNumByday();
+    List<BoxOutput>  zz_selectInstoreNumByday();
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java
index d1bdded..2a2198f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java
@@ -121,16 +121,16 @@ public class BroadDataServiceImpl implements IBroadDataService
     }
 
     @Override
-    public List<OrderInfo> mtk_selectOrderInfoBy3d() {
+    public List<BoxOutput> mtk_selectOrderInfoBy3d() {
         return mapper.mtk_selectOrderInfoBy3d();
     }
     @Override
-    public List<OrderInfo> mtk_selectOrderInfoBy3dTatle() {
+    public List<BoxOutput> mtk_selectOrderInfoBy3dTatle() {
         return mapper.mtk_selectOrderInfoBy3dTatle();
     }
 
     @Override
-    public List<OrderInfo> zz_selectInstoreNumByday() {
+    public List<BoxOutput> zz_selectInstoreNumByday() {
         return mapper.mtk_selectInstoreNumByday();
     }
     ///////////////////////////////////////////////////////////////////////////
diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
index ea89918..2b62548 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
@@ -618,7 +618,7 @@ from (
         where to_char(ippi.CREATION_DATE, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd') and ippi. DELETE_FLAG=0
     </select>
 
-    <select id="mtk_selectOrderInfoBy3dTatle" resultType="com.ruoyi.system.domain.OrderInfo">
+    <select id="mtk_selectOrderInfoBy3dTatle" resultType="com.ruoyi.system.domain.BoxOutput">
         select sum(ORDER_QTY) as qty, '订单数量' as name
         from IMOS_PR_ORDER
         where FINISH_DATE between to_date(to_char(SYSDATE - 3, 'yyyy-MM-dd') || '00:00:00', 'yyyy-MM-dd hh24:mi:ss')
@@ -655,7 +655,7 @@ from (
         from IMOS_PR_PRODUCT_IN
         where to_char(CREATION_DATE, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd')
     </select>
-    <select id="mtk_selectOrderInfoBy3d" resultType="com.ruoyi.system.domain.OrderInfo">
+    <select id="mtk_selectOrderInfoBy3d" resultType="com.ruoyi.system.domain.BoxOutput">
         select substr(ORDER_NO, 5, length(ORDER_NO)) || '(' || substr(
                 substr(MATERIAL_NAME,
                        instr(MATERIAL_NAME, '-', 1, 1) + 1,
@@ -675,7 +675,7 @@ from (
         select * from (select rate,'不合格率目标' from haiwei.BASE_ONE_UNQUQLIFIED_RATE order by CREATE_TIME desc) where ROWNUM=1
     </select>
 
-    <select id="mtk_selectInstoreNumByday" resultType="com.ruoyi.system.domain.OrderInfo">
+    <select id="mtk_selectInstoreNumByday" resultType="com.ruoyi.system.domain.BoxOutput">
         select substr(
                MATERIAL_NAME,
                instr(MATERIAL_NAME, '-', 1, 1) + 1,