配送列表总信息调整

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