Merge branch 'pre-production'

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">

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)) {