From a9c0ee95857ad9552fb3f1d67cb3574d8b7137cf Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Sun, 24 Dec 2023 00:52:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/sgzb/largeScreen/util/CommonUtil.java  |  3 +++
 .../mapper/largeScreen/LargeScreenMapper.xml         | 12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/util/CommonUtil.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/util/CommonUtil.java
index 1d0162d5..73d6f2f7 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/util/CommonUtil.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/util/CommonUtil.java
@@ -113,6 +113,9 @@ public class CommonUtil {
         BigDecimal jjValue = new BigDecimal(new Double(0).toString());
         BigDecimal tsValue = new BigDecimal(new Double(0).toString());
         for (int i = 0; i < list.size(); i++) {
+            if(Objects.isNull(list.get(i))){
+                continue;
+            }
             if (Objects.equals(list.get(i).getCompanyName(), CommonConstants.JJ)) {
                 BigDecimal value = new BigDecimal(new Double(list.get(i).getNum()).toString());
                 jjValue = jjValue.add(value);
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
index 50a70919..8f26a0f7 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
@@ -16,13 +16,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <!--退料数据-->
     <select id="getMaterialReturnData" resultType="com.bonus.sgzb.largeScreen.domain.MaTypeDo">
-        SELECT SUM(bcd.back_num) AS num,
-               bcd.company_id AS companyId,
+        SELECT bad.audit_num AS num,
+               mt.company_id AS companyId,
                sd.dept_name AS companyName
-        FROM back_check_details bcd
-        LEFT JOIN sys_dept sd ON bcd.company_id = sd.dept_id
-        WHERE bcd.create_time BETWEEN CONCAT(#{nowDate}, ' 00:00:00') AND CONCAT(#{nowDate}, ' 23:59:59')
-        GROUP BY bcd.company_id
+        FROM back_apply_details bad
+        LEFT JOIN ma_type mt ON bad.type_id = mt.type_id AND mt.`level` = '4'
+        LEFT JOIN sys_dept sd ON mt.company_id = sd.dept_id
+        WHERE bad.create_time BETWEEN CONCAT(#{nowDate}, ' 00:00:00') AND CONCAT(#{nowDate}, ' 23:59:59')
     </select>
     <!--当月领料分析-->
     <select id="getPickingAnalysisByMonth" resultType="com.bonus.sgzb.largeScreen.domain.MaTypeDo">