首页数据修复

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml

@@ -463,6 +463,7 @@
         INNER JOIN logpm_distribution_reservation AS ldr ON ldr.id = lds.reservation_id
         <where>
             ldr.reservation_status != '40'
+            AND ldr.is_deleted = 0
             <if test="id!='' and id != null">
                 and lddl.id = #{id}
             </if>

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.java

@@ -287,4 +287,11 @@ public interface WarehouseIndexMapper {
 	 * @return
 	 */
 	String findBillLadingPlanNumByDay(@Param("param")IndexDTO indexDTO);
+
+	/**
+	 *查询当月自提计划数
+	 * @param indexDTO
+	 * @return
+	 */
+	String findBillLadingPlanNumByMonth(@Param("param")IndexDTO indexDTO);
 }

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml

@@ -887,6 +887,22 @@
         </where>
     </select>
     <select id="findBillLadingPlanNumByDay" resultType="java.lang.String">
+        SELECT
+        count(1)  AS num
+        FROM
+        logpm_distrilbution_bill_lading
+        <where>
+            is_deleted = 0
+            AND DATE_FORMAT( create_time, '%y%m%d' ) = DATE_FORMAT( #{param.dayStr}, '%y%m%d' )
+            <if test="param.warehouseIds != null">
+                AND warehouse_id
+                <foreach collection="param.warehouseIds" item="item" open="in (" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+    <select id="findBillLadingPlanNumByMonth" resultType="java.lang.String">
         SELECT
         count(1)  AS num
         FROM

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java

@@ -408,10 +408,21 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService {
 			String signScale = multiply.toString();
 			indexBillLadingSignforDayDataVO.setClerkSignforScale(signScale);
 		}
+		//查询当天计划数
+		String dayBillLadingPlanNum = warehouseIndexMapper.findBillLadingPlanNumByDay(indexDTO);
+
+
 		//查询当天文员复核数
 		String dayBillLadingSignforNum = warehouseIndexMapper.findBillLadingSignForNumByDay(indexDTO);
 		indexBillLadingSignforDayDataVO.setClerkSignNum(dayBillLadingSignforNum);
-
+		if (!"0".equals(dayBillLadingPlanNum)  && !"0".equals(dayBillLadingSignforNum) ) {
+			//计算当月的超时签收率
+			BigDecimal bd1 = new BigDecimal(dayBillLadingSignforNum);
+			BigDecimal bd2 = new BigDecimal(dayBillLadingPlanNum);
+			BigDecimal multiply = bd1.divide(bd1.add(bd2),1, BigDecimal.ROUND_CEILING);
+			String signScale = multiply.toString();
+			indexBillLadingSignforDayDataVO.setClerkOverTimeScale(signScale);
+		}
 		//查询当天签收超时数
 		String dayBillLadingverTimeNum = warehouseIndexMapper.findBillLadingOverTimeNumByDay(indexDTO);
 		indexBillLadingSignforDayDataVO.setClerkOverTimeSignfoNum(dayBillLadingverTimeNum);
@@ -443,7 +454,7 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService {
 		String monthBillLadingOverTimeNum = warehouseIndexMapper.findBillLadingOverTimeNumByDay(indexDTO);
 		indexBillLadingSignforMonthDataVO.setClerkOverTimeSignfoNum(monthBillLadingOverTimeNum);
 		//查询当月计划总数
-		String monthBillLadingPlanNum = warehouseIndexMapper.findBillLadingPlanNumByDay(indexDTO);
+		String monthBillLadingPlanNum = warehouseIndexMapper.findBillLadingPlanNumByMonth(indexDTO);
 		if (!"0".equals(monthBillLadingOverTimeNum)  && !"0".equals(monthBillLadingPlanNum) ) {
 			//计算当月的超时签收率
 			BigDecimal bd1 = new BigDecimal(monthBillLadingOverTimeNum);