From 383436d5f12542e7c6c070993e2b054b39b5aa4e Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 19 Jun 2024 17:37:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E5=88=97=E8=A1=A8=E6=80=BB?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionDeliveryListMapper.xml | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
index 704367e33..fbe63fa8b 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
@@ -600,7 +600,7 @@
     <select id="selectBycommercialNub" resultType="java.lang.Integer">
         SELECT COALESCE(COUNT(*), 0) FROM logpm_distribution_delivery_list lddl
         <where>
-            lddl.type = '1' AND lddl.customers_number > 0
+              lddl.customers_number > 0
             <if test="param.trainNumber != null and param.trainNumber!=''">
                 and lddl.train_number like concat('%',#{param.trainNumber},'%')
             </if>
@@ -637,6 +637,9 @@
             <if test="param.loadingTime!=null and param.loadingTime!=''">
                 and lddl.date_format(loading_time,'%y%m%d%') = date_format(#{param.loadingTime},'%y%m%d%')
             </if>
+            <if test="param.type!=null and param.type!=''">
+                and lddl.type = #{param.type}
+            </if>
         </where>
     </select>
     <select id="selectcommercialTotal" resultType="java.lang.Integer">
@@ -645,7 +648,7 @@
         logpm_distribution_delivery_list lddl join logpm_distribution_signfor lds on lddl.id = lds.delivery_id
         join logpm_distribution_reservation ldr on lds.reservation_id =ldr.id
         <where>
-            lddl.type = '1'
+            lddl.is_deleted = 0
             <if test="param.trainNumber != null and param.trainNumber!=''">
                 and lddl.train_number like concat('%',#{param.trainNumber},'%')
             </if>
@@ -682,6 +685,9 @@
             <if test="param.loadingTime!=null and param.loadingTime!=''">
                 and lddl.date_format(loading_time,'%y%m%d%') = date_format(#{param.loadingTime},'%y%m%d%')
             </if>
+            <if test="param.type!=null and param.type!=''">
+                and lddl.type = #{param.type}
+            </if>
         </where>
     </select>
     <select id="selectmarketNub" resultType="java.lang.Integer">
@@ -725,6 +731,9 @@
             <if test="param.loadingTime!=null and param.loadingTime!=''">
                 and lddl.date_format(loading_time,'%y%m%d%') = date_format(#{param.loadingTime},'%y%m%d%')
             </if>
+            <if test="param.type!=null and param.type!=''">
+                and lddl.type = #{param.type}
+            </if>
         </where>
     </select>
     <select id="selectmarketTotal" resultType="java.lang.Integer">
@@ -733,7 +742,7 @@
         FROM
         logpm_distribution_delivery_list lddl
         <where>
-            lddl.type = '2'
+            lddl.is_deleted = 0
             <if test="param.trainNumber != null and param.trainNumber!=''">
                 and lddl.train_number like concat('%',#{param.trainNumber},'%')
             </if>
@@ -770,6 +779,9 @@
             <if test="param.loadingTime!=null and param.loadingTime!=''">
                 and lddl.date_format(loading_time,'%y%m%d%') = date_format(#{param.loadingTime},'%y%m%d%')
             </if>
+            <if test="param.type!=null and param.type!=''">
+                and lddl.type = #{param.type}
+            </if>
         </where>
     </select>
     <select id="selectdeliverywork" resultType="com.logpm.distribution.entity.DistributionLoadscanEntity">
@@ -1108,7 +1120,7 @@
         logpm_distribution_delivery_list lddl join logpm_distribution_signfor lds on lddl.id = lds.delivery_id
         join logpm_distribution_reservation ldr on lds.reservation_id =ldr.id
         <where>
-            lddl.type = '1'
+            lddl.is_deleted = 0
             <if test="param.trainNumber != null and param.trainNumber!=''">
                 and lddl.train_number like concat('%',#{param.trainNumber},'%')
             </if>
@@ -1145,6 +1157,10 @@
             <if test="param.loadingTime!=null and param.loadingTime!=''">
                 and lddl.date_format(loading_time,'%y%m%d%') = date_format(#{param.loadingTime},'%y%m%d%')
             </if>
+            <if test="param.type!=null and param.type!=''">
+                and lddl.type = #{param.type}
+            </if>
+
         </where>
     </select>
     <select id="selectminventoryTotal" resultType="java.lang.Integer">
@@ -1153,7 +1169,7 @@
         logpm_distribution_delivery_list lddl join logpm_distribution_signfor lds on lddl.id = lds.delivery_id
         join logpm_distribution_reservation ldr on lds.reservation_id =ldr.id
         <where>
-            lddl.type = '2'
+            lddl.is_deleted = 0
             <if test="param.trainNumber != null and param.trainNumber!=''">
                 and lddl.train_number like concat('%',#{param.trainNumber},'%')
             </if>
@@ -1190,6 +1206,9 @@
             <if test="param.loadingTime!=null and param.loadingTime!=''">
                 and lddl.date_format(loading_time,'%y%m%d%') = date_format(#{param.loadingTime},'%y%m%d%')
             </if>
+            <if test="param.type!=null and param.type!=''">
+                and lddl.type = #{param.type}
+            </if>
         </where>
     </select>
     <select id="selectCompletecusCount" resultType="java.lang.Integer">