From 9b10d7385c8cd3cc314f11a31d33c18e177c78ae Mon Sep 17 00:00:00 2001
From: Diss <1157651603@qq.com>
Date: Tue, 9 Jan 2024 15:53:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E4=BB=B6=E6=98=8E=E7=BB=86=EF=BC=9A?=
=?UTF-8?q?=E5=85=A5=E5=BA=93=E6=97=B6=E9=97=B4=EF=BC=8C=E8=A3=85=E8=BD=A6?=
=?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=8C=E7=AD=BE=E6=94=B6=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=E5=B7=B2=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E8=BF=9B=E8=A1=8C?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2=20=E5=AE=9E=E9=99=85=E8=A3=85=E8=BD=A6?=
=?UTF-8?q?=E4=BA=BA=EF=BC=8C=E5=AE=9E=E9=99=85=E7=AD=BE=E6=94=B6=E4=BA=BA?=
=?UTF-8?q?=EF=BC=8C=E9=85=8D=E9=80=81=E8=BD=A6=E6=AC=A1=E5=8F=B7=EF=BC=8C?=
=?UTF-8?q?=E8=BD=A6=E7=89=8C=E5=8F=B7=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../vo/DistributionParcelListVO.java | 34 +++++++++++++++++++
.../mapper/DistributionParcelListMapper.xml | 23 ++++++++++---
2 files changed, 53 insertions(+), 4 deletions(-)
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java
index 46584e39c..836c3ffd8 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java
+++ b/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;
+
}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
index e443fba7a..8449daa30 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
@@ -163,11 +163,11 @@
and ldr.reservation_code = #{param.reservationCode}
-
- and lddl.vehicle_name = #{param.DvehicleName}
+
+ and lddl.vehicle_name = #{param.dvehicleName}
-
- and ldl.vehicle_name = #{param.ZvehicleName}
+
+ and ldl.vehicle_name = #{param.vehicleName}
and date_format(from_unixtime(ldl.scan_time),'%Y-%m-%d') = date_format(#{param.scanTime}),'%Y-%m-%d')
@@ -253,6 +253,21 @@
and ldpl.waybill_number = #{param.waybillNumber}
+
+ and ldl.scan_user = #{param.scanUser}
+
+
+ and ldl.signing_user = #{param.signingUser}
+
+
+ and ldpl.warehouse_entry_time_end BETWEEN #{param.startWarehouseEntryTimeEnd} AND #{param.lastWarehouseEntryTimeEnd}
+
+
+ AND ldl.scan_time BETWEEN #{param.startLoadingTime} AND #{param.lastLoadingTime}
+
+
+ AND ldl.signing_time BETWEEN #{param.startSigningTime} AND #{param.lastSigningTime}
+