Merge branch 'dev' into pre-production

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/InventoryDetailEntity.java

@@ -1,6 +1,7 @@
 package com.logpm.oldproject.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -21,9 +22,11 @@ public class InventoryDetailEntity {
 	private Integer id;
 
 	@JsonProperty("unitNo")
+	@TableField(value = "unitNo")
 	private String unitNo;
 
 	@JsonProperty("orderSelfNum")
+	@TableField(value = "orderSelfNum")
 	private String orderSelfNum;
 
 	private Integer abnormalStatus;

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

@@ -366,6 +366,33 @@
                    #{item}
                </foreach>
            </if>
+           <if test=" params.trainNumber != '' and params.trainNumber != null">
+               AND lddl.train_number like concat('%',#{params.trainNumber},'%')
+           </if>
+           <if test=" params.clineName != '' and params.clineName != null">
+               AND ldr.consignee like concat('%',#{params.clineName},'%')
+           </if>
+           <if test=" params.type != '' and params.type != null">
+               AND lddl.type = #{params.type}
+           </if>
+           <if test=" params.kind != '' and params.kind != null">
+               AND lddl.kind = #{params.kind}
+           </if>
+           <if test=" params.vehicleName != '' and params.vehicleName != null">
+               AND ldds.vehicle_nub like  concat('%',#{params.vehicleName},'%')
+           </if>
+           <if test=" params.driverName != '' and params.driverName != null">
+               AND ldds.driver_name like  concat('%',#{params.driverName},'%')
+           </if>
+           <if test=" params.distributionCompany != '' and params.distributionCompany != null">
+               AND ldds.distribution_company like  concat('%',#{params.distributionCompany},'%')
+           </if>
+           <if test=" params.taskTime != '' and params.taskTime != null">
+               AND ldds.task_time like  concat('%',#{params.taskTime},'%')
+           </if>
+           <if test=" params.deliveryStatus != '' and params.deliveryStatus != null">
+               AND lddl.delivery_status =#{params.deliveryStatus}
+           </if>
        </where>
         GROUP BY
         lddl.id