包件明细：入库时间，装车时间，签收时间已时间范围进行搜索

实际装车人，实际签收人，配送车次号，车牌号搜索功能

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java

@@ -17,6 +17,7 @@
 package com.logpm.distribution.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -167,4 +168,37 @@ public class DistributionParcelListVO extends DistributionParcelListEntity {
 	private String noteNumber;
 
 
+	/**
+	 *  时间模糊查询需要的值
+	 */
+	@ApiModelProperty(value = "入库开始时间")
+	@TableField(exist = false)
+	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+	private String startWarehouseEntryTimeEnd;
+
+	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "入库结束时间")
+	@TableField(exist = false)
+	private String lastWarehouseEntryTimeEnd;
+
+	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "装车开始时间")
+	@TableField(exist = false)
+	private String startLoadingTime;
+
+	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "装车结束时间")
+	@TableField(exist = false)
+	private String lastLoadingTime;
+
+	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "签收开始时间")
+	@TableField(exist = false)
+	private String startSigningTime;
+
+	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "签收结束时间")
+	@TableField(exist = false)
+	private String lastSigningTime;
+
 }

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

@@ -163,11 +163,11 @@
             <if test="param.reservationCode !='' and param.reservationCode != null">
                 and ldr.reservation_code = #{param.reservationCode}
             </if>
-            <if test="param.DvehicleName !='' and param.DvehicleName != null">
-                and lddl.vehicle_name = #{param.DvehicleName}
+            <if test="param.dvehicleName !='' and param.dvehicleName != null">
+                and lddl.vehicle_name = #{param.dvehicleName}
             </if>
-            <if test="param.ZvehicleName !='' and param.ZvehicleName != null">
-                and ldl.vehicle_name = #{param.ZvehicleName}
+            <if test="param.vehicleName !='' and param.vehicleName != null">
+                and ldl.vehicle_name = #{param.vehicleName}
             </if>
             <if test="param.scanTime !='' and param.scanTime != null">
                 and date_format(from_unixtime(ldl.scan_time),'%Y-%m-%d') = date_format(#{param.scanTime}),'%Y-%m-%d')
@@ -253,6 +253,21 @@
             <if test="param.waybillNumber != '' and param.waybillNumber != null ">
                 and ldpl.waybill_number = #{param.waybillNumber}
             </if>
+            <if test="param.scanUser !='' and param.scanUser != null">
+                and ldl.scan_user = #{param.scanUser}
+            </if>
+            <if test="param.signingUser !='' and param.signingUser != null">
+                and ldl.signing_user  = #{param.signingUser}
+            </if>
+            <if test="param.startWarehouseEntryTimeEnd != null and param.startWarehouseEntryTimeEnd !='' and param.lastWarehouseEntryTimeEnd !=''and param.lastWarehouseEntryTimeEnd != null">
+               and ldpl.warehouse_entry_time_end  BETWEEN #{param.startWarehouseEntryTimeEnd} AND #{param.lastWarehouseEntryTimeEnd}
+            </if>
+            <if test="param.startLoadingTime != null and param.lastLoadingTime != null and param.startLoadingTime != '' and param.lastLoadingTime != ''">
+                AND ldl.scan_time  BETWEEN #{param.startLoadingTime} AND #{param.lastLoadingTime}
+            </if>
+            <if test="param.startSigningTime != null and param.lastSigningTime != null and param.startSigningTime != '' and param.lastSigningTime != ''">
+                AND ldl.signing_time  BETWEEN #{param.startSigningTime} AND #{param.lastSigningTime}
+            </if>
 
         </where>