From 13572bca5666516acd7cfc45033eabe623b33c57 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 26 Jun 2024 18:17:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9F=A5=E8=AF=A2=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/mapper/WarehouseIndexMapper.xml    | 68 +++----------------
 .../impl/WarehouseIndexServiceImpl.java       | 46 ++++++++++---
 2 files changed, 43 insertions(+), 71 deletions(-)

diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml
index 78495c4e1..5590e8953 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml
@@ -493,7 +493,7 @@
     </select>
     <select id="findSignforDataByMonth" resultType="java.lang.Integer">
         SELECT
-        ((
+        (
         SELECT
         IFNULL( SUM( received_quantity ), 0 )
         FROM
@@ -509,27 +509,11 @@
                 </foreach>
             </if>
         </where>
-        ) + (
-        SELECT
-        IFNULL( SUM( quantity ), 0 )
-        FROM
-        logpm_distribution_bill_lading_scan
-        <where>
-            material_type = 2
-            AND DATE_FORMAT( create_time, "%y%m" ) = DATE_FORMAT( #{param.dayStr}, "%y%m" )
-            AND is_deleted = 0
-            <if test="param.warehouseIds != null">
-                and warehouse_id in
-                <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-        </where>
-        )) AS num
+        )  AS num
     </select>
     <select id="findUnSignforDataByDay" resultType="java.lang.Integer">
         SELECT
-        ((
+        (
         SELECT
         IFNULL( sum( quantity ), 0 )
         FROM
@@ -547,29 +531,11 @@
                 </foreach>
             </if>
         </where>
-        ) + (
-        SELECT
-        IFNULL( sum( quantity ), 0 )
-        FROM
-        logpm_distrilbution_bill_package AS ldbp
-        LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldbp.parce_list_id = ldpl.id
-        <where>
-            ldpl.order_package_status != 70
-            AND ldbp.packet_bar_status != 2
-            AND ldbp.is_deleted = 0
-            AND DATE_FORMAT( ldbp.create_time, "%y%m%d" ) = DATE_FORMAT( #{param.dayStr}, "%y%m%d" )
-            <if test="param.warehouseIds != null">
-                AND ldpl.warehouse_id IN
-                <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-        </where>
-        ))
+        )
     </select>
     <select id="findUnSignforDataByMonth" resultType="java.lang.Integer">
         SELECT
-        ((
+        (
         SELECT
         IFNULL( sum( quantity ), 0 )
         FROM
@@ -587,25 +553,7 @@
                 </foreach>
             </if>
         </where>
-        ) + (
-        SELECT
-        IFNULL( sum( quantity ), 0 )
-        FROM
-        logpm_distrilbution_bill_package AS ldbp
-        LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldbp.parce_list_id = ldpl.id
-        <where>
-            ldpl.order_package_status != 70
-            AND ldbp.packet_bar_status != 2
-            AND ldbp.is_deleted = 0
-            AND DATE_FORMAT( ldbp.create_time, "%y%m" ) = DATE_FORMAT( #{param.dayStr}, "%y%m" )
-            <if test="param.warehouseIds != null">
-                AND ldpl.warehouse_id IN
-                <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-        </where>
-        ))
+        )
     </select>
     <select id="findClerkSignforNumByDay" resultType="java.lang.Integer">
         SELECT
@@ -655,7 +603,7 @@
         <where>
             reservation_status != 40
             AND is_deleted = 0
-            AND DATE_FORMAT(created_time, "%y%m%d" ) = DATE_FORMAT( #{param.dayStr}, "%y%m%d" )
+            AND DATE_FORMAT(create_time, "%y%m%d" ) = DATE_FORMAT( #{param.dayStr}, "%y%m%d" )
             <if test="param.warehouseIds != null">
                 AND warehouse_id IN
                 <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
@@ -672,7 +620,7 @@
         <where>
             reservation_status != 40
             AND is_deleted = 0
-            AND DATE_FORMAT(created_time, "%y%m" ) = DATE_FORMAT( #{param.dayStr}, "%y%m" )
+            AND DATE_FORMAT(create_time, "%y%m" ) = DATE_FORMAT( #{param.dayStr}, "%y%m" )
             <if test="param.warehouseIds != null">
                 AND warehouse_id IN
                 <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java
index 2d541253f..1a1230fa0 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java
@@ -310,19 +310,28 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService {
 		Integer dayUnSignforNum = warehouseIndexMapper.findUnSignforDataByDay(indexDTO);
 		indexSignforDayDataVO.setUnSignNum(dayUnSignforNum);
 		//计算签收率
-		Double daySignforScale = (double) (daySignforNum / (daySignforNum + dayUnSignforNum) * 100);
-		indexSignforDayDataVO.setSignScale(daySignforScale);
+		if (daySignforNum > 0 && (daySignforNum + dayUnSignforNum) >0){
+			Double daySignforScale = (double) (daySignforNum / (daySignforNum + dayUnSignforNum) * 100);
+			indexSignforDayDataVO.setSignScale(daySignforScale);
+		}else {
+			indexSignforDayDataVO.setSignScale(0.00);
+		}
 		//查询当天文员复核数
 		Integer dayClerkSignforNum = warehouseIndexMapper.findClerkSignforNumByDay(indexDTO);
 		indexSignforDayDataVO.setClerkSignNum(dayClerkSignforNum);
 		//查询当天计划数
 		Integer dayPlanByday = warehouseIndexMapper.findPlanNumByDay(indexDTO);
 		//计算文员签收率
-		Double dayClerkSignforScale = (double) (dayClerkSignforNum / (dayPlanByday + dayClerkSignforNum));
-		indexSignforDayDataVO.setClerkSignforScale(dayClerkSignforScale);
+		if (dayClerkSignforNum > 0 && (dayPlanByday + dayClerkSignforNum)>0){
+			Double dayClerkSignforScale = (double) (dayClerkSignforNum / (dayPlanByday + dayClerkSignforNum));
+			indexSignforDayDataVO.setClerkSignforScale(dayClerkSignforScale);
+		} else {
+			indexSignforDayDataVO.setClerkSignforScale(0.00);
+
+		}
 		//文员超时复核数
 		Integer dayClerkOverTimeSignfoNum = warehouseIndexMapper.findClerkOverTimeNumByDay(indexDTO);
-//		indexSignforDayDataVO.setClerkOverTimeSignfoNum(dayClerkOverTimeSignfoNum);
+		indexSignforDayDataVO.setClerkOverTimeSignfoNum(dayClerkOverTimeSignfoNum);
 
 
 		indexSignforDayDataVO.setClerkSignNum(dayClerkSignforNum);
@@ -336,19 +345,34 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService {
 		Integer monthUnSignforNum = warehouseIndexMapper.findUnSignforDataByMonth(indexDTO);
 		indexSignforMonthDataVO.setUnSignNum(monthUnSignforNum);
 		//计算签收率
-		Double monthSignforScale = (double) (monthSignforNum / (monthUnSignforNum + monthSignforNum) * 100);
-		indexSignforMonthDataVO.setSignScale(monthSignforScale);
+		if (monthSignforNum > 0  && (monthUnSignforNum + monthSignforNum) > 0){
+			Double monthSignforScale = (double) (monthSignforNum / (monthUnSignforNum + monthSignforNum));
+			indexSignforMonthDataVO.setSignScale(monthSignforScale);
+		}else {
+			indexSignforMonthDataVO.setSignScale(0.00);
+
+		}
+
 		//查询当月文员复核数
 		Integer monthClerkSignforNum = warehouseIndexMapper.findClerkSignforNumByMonth(indexDTO);
 		indexSignforMonthDataVO.setClerkSignNum(monthClerkSignforNum);
 		Integer monthPlanByday = warehouseIndexMapper.findPlanNumByMonth(indexDTO);
-		Double monthClerkSignforScale = (double) (monthClerkSignforNum / (monthPlanByday + monthClerkSignforNum));
-		indexSignforMonthDataVO.setClerkSignforScale(monthClerkSignforScale);
+		if (monthClerkSignforNum > 0 && (monthPlanByday + monthClerkSignforNum)>0){
+			Double monthClerkSignforScale = (double) (monthClerkSignforNum / (monthPlanByday + monthClerkSignforNum));
+			indexSignforMonthDataVO.setClerkSignforScale(monthClerkSignforScale);
+		}else {
+			indexSignforMonthDataVO.setClerkSignforScale(0.00);
+		}
 		//查询当月文员复核
 		Integer monthClerkOverTimeSignfoNum = warehouseIndexMapper.findClerkOverTimeNumByMonth(indexDTO);
 		indexSignforMonthDataVO.setClerkOverTimeSignfoNum(monthClerkOverTimeSignfoNum);
-		Double monthClerkOverTimeScale = (double) (monthClerkOverTimeSignfoNum / monthPlanByday);
-		indexSignforMonthDataVO.setClerkOverTimeScale(monthClerkOverTimeScale);
+		if (monthClerkOverTimeSignfoNum >0 && monthPlanByday>0){
+			Double monthClerkOverTimeScale = (double) (monthClerkOverTimeSignfoNum / monthPlanByday);
+			indexSignforMonthDataVO.setClerkOverTimeScale(monthClerkOverTimeScale);
+
+		}else {
+			indexSignforMonthDataVO.setClerkOverTimeScale(0.00);
+		}
 		list.add(indexSignforMonthDataVO);
 		return list;
 	}