From 012149b1dc2052fbe28ad39e383d6fd61939ee5e Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Thu, 25 Jan 2024 15:18:49 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zhgd/xmgl/base/entity/vo/FlexibleBigScreenVo.java | 8 +++++---
 .../com/zhgd/xmgl/modules/rt/mapper/xml/RtToolMapper.xml  | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/base/entity/vo/FlexibleBigScreenVo.java b/src/main/java/com/zhgd/xmgl/base/entity/vo/FlexibleBigScreenVo.java
index 3c0dbe413..c4684d10c 100644
--- a/src/main/java/com/zhgd/xmgl/base/entity/vo/FlexibleBigScreenVo.java
+++ b/src/main/java/com/zhgd/xmgl/base/entity/vo/FlexibleBigScreenVo.java
@@ -1,11 +1,13 @@
 package com.zhgd.xmgl.base.entity.vo;
 
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.zhgd.xmgl.util.DateUtils;
 import lombok.Data;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -51,7 +53,7 @@ public class FlexibleBigScreenVo {
     public static FlexibleBigScreenVo fillTrendVos(FlexibleBigScreenVo rtVo, List<String> days, String format) {
         List<String> dimensions = rtVo.getDimensions();
         String timeKey = dimensions.get(0);
-        Map<String, HashMap<String, Object>> voMap = rtVo.getSource().stream().collect(Collectors.toMap(o -> o.get(timeKey).toString(), Function.identity()));
+        Map<String, HashMap<String, Object>> voMap = rtVo.getSource().stream().filter(o -> o.get(timeKey) != null).collect(Collectors.toMap(o -> o.get(timeKey).toString(), Function.identity()));
         List<HashMap<String, Object>> rtList = new ArrayList<>();
         for (String day : days) {
             HashMap<String, Object> vo = voMap.get(day);
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 59e3ebc2b..85761e5c5 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,7 +11,7 @@
     </select>
 
     <select id="countRtToolTrend" resultType="java.util.HashMap">
-        select t1.day,t1.当日入库量,t2.当日出库量 from (
+        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}
@@ -29,7 +29,7 @@
         </if>
         )t2 on t1.day=t2.day
         union
-        select t1.day,t1.当日入库量,t2.当日出库量 from (
+        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}