From 0b86551ad625bc41e957bd77485d521ccb59d5ad Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Tue, 7 Jan 2025 16:37:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=EF=BC=8C=E8=BF=99=E9=87=8C=E7=9A=84?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=B9=E5=BC=8F=E5=AD=98=E5=9C=A8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E9=9C=80=E8=A6=81=E8=80=83=E8=99=91=E8=B5=B0?=
 =?UTF-8?q?fengin=E7=9A=84=E6=96=B9=E5=BC=8F=20=E7=9B=B4=E6=8E=A5=E5=B8=A6?=
 =?UTF-8?q?=E4=B8=8A=E6=95=B0=E6=8D=AE=E5=BA=93=E5=90=8D=E7=A7=B0=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=96=B9=E5=BC=8F=E4=B8=8D=E5=A4=AA=E5=8F=AF=E5=8F=96?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/mapper/largeScreen/DeliveryDataMapper.xml |  6 +++---
 .../largeScreen/impl/CarsLoadDataServiceImpl.java    | 12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/DeliveryDataMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/DeliveryDataMapper.xml
index 9d4e6d450..4f0ca17b1 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/DeliveryDataMapper.xml
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/DeliveryDataMapper.xml
@@ -4,7 +4,7 @@
     <select id="getDeliveryAllData" resultType="com.logpm.report.vo.largeScreen.DeliveryDataVO">
         select
             count(*) as total,
-            sum(case when delivery_status = '3' then 0 else 1 end) as toBeSigned
+            count(case when delivery_status = '3' then null else 1 end) as toBeSigned
         from logpm_platform.logpm_distribution_delivery_list
         <if test="startTime != null">
             where create_time between #{startTime} and #{endTime}
@@ -13,7 +13,7 @@
     <select id="getDelivery2BData" resultType="com.logpm.report.vo.largeScreen.DeliveryDataVO">
         select
             count(*) as total2B,
-            sum(case when delivery_status = '3' then 0 else 1 end) as toBeSigned2B
+            count(case when delivery_status = '3' then null else 1 end) as toBeSigned2B
         from logpm_platform.logpm_distribution_delivery_list
         where type = '1'
         <if test="startTime != null">
@@ -23,7 +23,7 @@
     <select id="getDelivery2CData" resultType="com.logpm.report.vo.largeScreen.DeliveryDataVO">
         select
             count(*) as total2C,
-            sum(case when delivery_status = '3' then 0 else 1 end) as toBeSigned2C
+            count(case when delivery_status = '3' then null else 1 end) as toBeSigned2C
         from logpm_platform.logpm_distribution_delivery_list
         where type = '2'
         <if test="startTime != null">
diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/CarsLoadDataServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/CarsLoadDataServiceImpl.java
index 63b49af0f..46d775dbd 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/CarsLoadDataServiceImpl.java
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/CarsLoadDataServiceImpl.java
@@ -41,6 +41,18 @@ public class CarsLoadDataServiceImpl implements ICarsLoadDataService {
 
 		HashMap<Long, CareerLineDataVO> resultMap = new HashMap<>();
 
+
+		// 构建返回的事业线数据
+		for (DeptInfoVO deptInfoVO : careerLineMap.values()) {
+
+			if(deptInfoVO.getDeptName().contains("事业线") && !deptInfoVO.getDeptName().equals("事业线")){
+
+				resultMap.put(deptInfoVO.getId(), new CareerLineDataVO(deptInfoVO.getDeptName().replace("事业线", ""), monthDataInit()));
+			}
+
+		}
+
+
 		for (VehicleStowageDataVO vehicleStowageDataVO : vehicleStowageData) {
 			Long DeptId = warehouseDept.get(vehicleStowageDataVO.getWarehouseId());
 			if (!careerLineMap.containsKey(DeptId)) {