From 53b0c330b203c74d7d4d8e13122655cbf673e075 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Tue, 12 Mar 2024 10:24:47 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rt/mapper/xml/RtToolHistoryMapper.xml     | 12 +++++------
 .../modules/rt/mapper/xml/RtToolMapper.xml    | 12 +++++------
 .../rt/mapper/xml/RtWorkTicketMapper.xml      | 21 +++++++++++++------
 .../rt/service/impl/RtToolServiceImpl.java    | 14 +++++++------
 .../service/impl/RtWorkTicketServiceImpl.java | 11 +++++++---
 5 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtToolHistoryMapper.xml b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtToolHistoryMapper.xml
index d1e1a18d7..aa59b05c0 100644
--- a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtToolHistoryMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtToolHistoryMapper.xml
@@ -10,8 +10,8 @@
     </select>
 
     <select id="countRtToolTrend" resultType="java.util.HashMap">
-        select t1.day,ifnull(t1.当日入库量,0) as 当日入库量,ifnull(t2.当日出库量,0) as 当日出库量 from (
-        select date_format(entry_time, '%Y-%m-%d') day, count(*) 当日入库量
+        select t1.day,ifnull(t1.当日入库次数,0) as 当日入库次数,ifnull(t2.当日出库次数,0) as 当日出库次数 from (
+        select date_format(entry_time, '%Y-%m-%d') day, count(*) 当日入库次数
         from rt_tool_history
         where project_sn = #{projectSn}
         <if test="type == '1'.toString()">
@@ -19,7 +19,7 @@
             group by day
         </if>
         )t1 left join (
-        select date_format(exit_time, '%Y-%m-%d') day, count(*) 当日出库量
+        select date_format(exit_time, '%Y-%m-%d') day, count(*) 当日出库次数
         from rt_tool_history
         where project_sn = #{projectSn}
         <if test="type == '1'.toString()">
@@ -28,8 +28,8 @@
         </if>
         )t2 on t1.day=t2.day
         union
-        select t2.day,ifnull(t1.当日入库量,0) as 当日入库量,ifnull(t2.当日出库量,0) as 当日出库量 from (
-        select date_format(entry_time, '%Y-%m-%d') day, count(*) 当日入库量
+        select t2.day,ifnull(t1.当日入库次数,0) as 当日入库次数,ifnull(t2.当日出库次数,0) as 当日出库次数 from (
+        select date_format(entry_time, '%Y-%m-%d') day, count(*) 当日入库次数
         from rt_tool_history
         where project_sn = #{projectSn}
         <if test="type == '1'.toString()">
@@ -37,7 +37,7 @@
             group by day
         </if>
         )t1 right join (
-        select date_format(exit_time, '%Y-%m-%d') day, count(*) 当日出库量
+        select date_format(exit_time, '%Y-%m-%d') day, count(*) 当日出库次数
         from rt_tool_history
         where project_sn = #{projectSn}
         <if test="type == '1'.toString()">
diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtToolMapper.xml b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtToolMapper.xml
index c26e32515..09420e24e 100644
--- a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtToolMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtToolMapper.xml
@@ -11,8 +11,8 @@
     </select>
 
     <select id="countRtToolTrend" resultType="java.util.HashMap">
-        select t1.day,ifnull(t1.当日入库量,0) as 当日入库量,ifnull(t2.当日出库量,0) as 当日出库量 from (
-        select date_format(entry_time, '%Y-%m-%d') day, count(*) 当日入库量
+        select t1.day,ifnull(t1.当日入库次数,0) as 当日入库次数,ifnull(t2.当日出库次数,0) as 当日出库次数 from (
+        select date_format(entry_time, '%Y-%m-%d') day, count(*) 当日入库次数
         from rt_tool
         where project_sn = #{projectSn}
         <if test="type == '1'.toString()">
@@ -20,7 +20,7 @@
             group by day
         </if>
         )t1 left join (
-        select date_format(exit_time, '%Y-%m-%d') day, count(*) 当日出库量
+        select date_format(exit_time, '%Y-%m-%d') day, count(*) 当日出库次数
         from rt_tool
         where project_sn = #{projectSn}
         <if test="type == '1'.toString()">
@@ -29,8 +29,8 @@
         </if>
         )t2 on t1.day=t2.day
         union
-        select t2.day,ifnull(t1.当日入库量,0) as 当日入库量,ifnull(t2.当日出库量,0) as 当日出库量 from (
-        select date_format(entry_time, '%Y-%m-%d') day, count(*) 当日入库量
+        select t2.day,ifnull(t1.当日入库次数,0) as 当日入库次数,ifnull(t2.当日出库次数,0) as 当日出库次数 from (
+        select date_format(entry_time, '%Y-%m-%d') day, count(*) 当日入库次数
         from rt_tool
         where project_sn = #{projectSn}
         <if test="type == '1'.toString()">
@@ -38,7 +38,7 @@
             group by day
         </if>
         )t1 right join (
-        select date_format(exit_time, '%Y-%m-%d') day, count(*) 当日出库量
+        select date_format(exit_time, '%Y-%m-%d') day, count(*) 当日出库次数
         from rt_tool
         where project_sn = #{projectSn}
         <if test="type == '1'.toString()">
diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtWorkTicketMapper.xml b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtWorkTicketMapper.xml
index 4a2f2e429..0223265c8 100644
--- a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtWorkTicketMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtWorkTicketMapper.xml
@@ -22,20 +22,29 @@
         pvc.video_type as pvc_video_type,
         pvc.is_enable as pvc_is_enable,
         pvc.account as pvc_account,
-        pvc.`password` as pvc_password ,
+        pvc.`password` as pvc_password,
         pvc.app_id as pvc_app_id,
         pvc.app_secret as pvc_app_secret,
         pvc.play_type as pvc_play_type
         from rt_work_ticket rwt
-        left join project_video_config pvc on pvc.project_sn=rwt.project_sn and is_enable=1
+        left join project_video_config pvc on pvc.project_sn = rwt.project_sn and is_enable = 1
         ${ew.customSqlSegment}
     </select>
 
     <select id="countRtWorkTicket" resultType="com.zhgd.xmgl.modules.rt.entity.vo.CountRtWorkTicketVo">
-        select t.*,(count-t.todayCount) historyCount
-        from (select
-        count(*) count,
-        ifnull(sum(if(create_time >= CURDATE(), 1, 0)), 0) as todayCount
+        select t.*, (count - t.todayCount) historyCount
+        from (select count(*) count,
+        ifnull(
+        sum(
+        IF
+        (((start_time <![CDATA[<=]]> now() OR start_time IS NULL)
+        AND (end_time >= now() OR end_time IS NULL)
+        AND (start_time IS NOT NULL OR end_time IS NOT NULL)),
+        1,
+        0
+        )),
+        0
+        ) AS todayCount
         from rt_work_ticket
         where project_sn = #{projectSn}) t
     </select>
diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java
index ea00e43e8..7fba3713d 100644
--- a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java
@@ -147,6 +147,8 @@ public class RtToolServiceImpl extends ServiceImpl<RtToolMapper, RtTool> impleme
             source1.addAll(source2);
             //实时和历史的记录相加
             Map<String, List<HashMap<String, Object>>> dayMap = source1.stream().collect(Collectors.groupingBy(map -> MapUtils.getString(map, "day")));
+            String inStr = "当日入库次数";
+            String outStr = "当日出库次数";
             for (Map.Entry<String, List<HashMap<String, Object>>> entry : dayMap.entrySet()) {
                 HashMap<String, Object> hm = new HashMap<>();
                 String key = entry.getKey();
@@ -156,20 +158,20 @@ public class RtToolServiceImpl extends ServiceImpl<RtToolMapper, RtTool> impleme
                 String day = null;
                 if (CollUtil.isNotEmpty(list)) {
                     for (HashMap<String, Object> map : list) {
-                        in += MapUtils.getInteger(map, "当日入库量");
-                        out += MapUtils.getInteger(map, "当日出库量");
+                        in += MapUtils.getInteger(map, inStr);
+                        out += MapUtils.getInteger(map, outStr);
                         day = MapUtils.getString(map, "day");
                     }
                 }
                 hm.put("day", day);
-                hm.put("当日入库量", in);
-                hm.put("当日出库量", out);
+                hm.put(inStr, in);
+                hm.put(outStr, out);
                 source.add(hm);
             }
             List<String> dimensions = new ArrayList<>();
             dimensions.add("day");
-            dimensions.add("当日入库量");
-            dimensions.add("当日出库量");
+            dimensions.add(inStr);
+            dimensions.add(outStr);
             flexibleBigScreenVo.setDimensions(dimensions);
             flexibleBigScreenVo.setSource(source);
             List<String> strList = DateUtils.getDateTimeStrList(60, "yyyy-MM-dd");
diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java
index be0ae2eef..8889b37a8 100644
--- a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java
@@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;
-import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
 import com.zhgd.xmgl.modules.project.entity.ProjectVideoConfig;
 import com.zhgd.xmgl.modules.project.mapper.ProjectVideoConfigMapper;
 import com.zhgd.xmgl.modules.rt.entity.RtRiskSecurityLibraryType;
@@ -87,8 +86,14 @@ public class RtWorkTicketServiceImpl extends ServiceImpl<RtWorkTicketMapper, RtW
         QueryWrapper<RtWorkTicket> queryWrapper = QueryGenerator.initPageQueryWrapper(RtWorkTicket.class, paramMap, alias);
         queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(RtWorkTicket::getId));
         if (Objects.equals(type, 1)) {
-            queryWrapper.le(RefUtil.fieldNameUlc(RtWorkTicket::getStartTime), DateUtil.now());
-            queryWrapper.ge(RefUtil.fieldNameUlc(RtWorkTicket::getEndTime), DateUtil.now());
+            String startTime = alias + RefUtil.fieldNameUlc(RtWorkTicket::getStartTime);
+            queryWrapper.and(qw -> qw.le(startTime, DateUtil.now())
+                    .or().isNull(startTime));
+            String endTime = alias + RefUtil.fieldNameUlc(RtWorkTicket::getEndTime);
+            queryWrapper.and(qw -> qw.ge(endTime, DateUtil.now())
+                    .or().isNull(endTime));
+            queryWrapper.and(qw -> qw.isNotNull(startTime)
+                    .or().isNotNull(endTime));
         }
         queryWrapper.le(Objects.equals(type, 2), RefUtil.fieldNameUlc(RtWorkTicket::getCreateTime), DateUtil.formatDateTime(DateUtil.endOfDay(DateUtil.offsetDay(DateUtil.date(), -1))));
         return queryWrapper;