From 9da5b1f0192f49710e6282783e8ac11387a0848f Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Thu, 21 Jul 2022 12:07:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8F=91=E6=B3=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/broad/FPBroadController.java   |  7 ++-
 .../mapper/system/BroadDataMapper.xml         | 56 +++++++++++--------
 2 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/FPBroadController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/FPBroadController.java
index 2b53815..e390ea9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/FPBroadController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/FPBroadController.java
@@ -103,7 +103,10 @@ public class FPBroadController {
 
     @PostMapping("/selectTeamGroups")
     @ApiOperation("班组是早晚")
-    public int selectTeamGroups(){
-        return iBroadDruidService.selectTeamGroups();
+    public String selectTeamGroups(){
+        Integer state=iBroadDruidService.selectTeamGroups();
+        Map<String,Integer> map=new HashMap<>();
+        map.put("班组",state);
+        return JSONObject.toJSONString(map);
     }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
index 9dc53e3..479a289 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
@@ -435,30 +435,38 @@
     </select>
 
     <select id="selectNowXkOutPut1" resultType="int">
-        select  nvl(sum(actual_qty), 0)
-        from IMOS.IMOS_PR_PLAN
+        select nvl(sum(actual_qty), 0)
+        from IMOS.IMOS_PR_PLAN ipp
+        left join (select * from haiwei.BASE_DAY_WBTIME where ROWNUM = 1 order by CREATE_TIME desc) wb on 1=1
         where plan_date is not null
-          and process_code = 1002
-          and delete_flag = '0'
---           and to_char(plan_date, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd')
-            and CREATION_DATE &gt;
-        case
-        when to_char(sysdate, 'hh24') &gt; 7 and to_char(sysdate, 'hh24') &lt; 20 then to_date(
-        to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00',
-        'yyyy-MM-dd hh24:mi:ss')
-        when to_char(sysdate, 'hh24') &lt; 7 then to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '19:30:00',
-        'yyyy-MM-dd hh24:mi:ss')
-        else to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '19:30:00', 'yyyy-MM-dd hh24:mi:ss')
-        end
-        and CREATION_DATE &lt;
-            case
-            when to_char(sysdate, 'hh24') &gt; 7 and to_char(sysdate, 'hh24') &lt; 20 then to_date(
-        to_char(SYSDATE, 'yyyy-MM-dd') || '19:30:00',
-        'yyyy-MM-dd hh24:mi:ss')
-        when to_char(sysdate, 'hh24') &lt; 7 then to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00',
-        'yyyy-MM-dd hh24:mi:ss')
-        else to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '24:00:00', 'yyyy-MM-dd hh24:mi:ss')
-        end
+        and process_code = 1002
+        and delete_flag = '0'
+        and ipp.CREATION_DATE between case when sysdate &lt; = wb.W_END then   W_START else W_END end
+        and   case when sysdate &lt; = wb.W_END then   W_END else B_END end
+--         select  nvl(sum(actual_qty), 0)
+--         from IMOS.IMOS_PR_PLAN
+--         where plan_date is not null
+--           and process_code = 1002
+--           and delete_flag = '0'
+-- --           and to_char(plan_date, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd')
+--             and CREATION_DATE &gt;
+--         case
+--         when to_char(sysdate, 'hh24') &gt; 7 and to_char(sysdate, 'hh24') &lt; 20 then to_date(
+--         to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00',
+--         'yyyy-MM-dd hh24:mi:ss')
+--         when to_char(sysdate, 'hh24') &lt; 7 then to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '19:30:00',
+--         'yyyy-MM-dd hh24:mi:ss')
+--         else to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '19:30:00', 'yyyy-MM-dd hh24:mi:ss')
+--         end
+--         and CREATION_DATE &lt;
+--             case
+--             when to_char(sysdate, 'hh24') &gt; 7 and to_char(sysdate, 'hh24') &lt; 20 then to_date(
+--         to_char(SYSDATE, 'yyyy-MM-dd') || '19:30:00',
+--         'yyyy-MM-dd hh24:mi:ss')
+--         when to_char(sysdate, 'hh24') &lt; 7 then to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00',
+--         'yyyy-MM-dd hh24:mi:ss')
+--         else to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '24:00:00', 'yyyy-MM-dd hh24:mi:ss')
+--         end
     </select>
 
     <select id="selectXK_H_QTY" resultType="int">
@@ -470,6 +478,6 @@
         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 BASE_DAY_WBTIME where ROWNUM=1 order by CREATE_TIME desc
     </select>
 </mapper>
\ No newline at end of file