From f13d54200a7c8c47d95dffee2e9bd25c304b43c4 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Fri, 12 Jul 2024 14:02:06 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E5=A2=9E=E5=8A=A0=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8=E7=AD=BE=E6=94=B6?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/logpm/report/mapper/ReportDeliverMapper.xml  | 8 ++++----
 .../java/com/logpm/report/query/DevilerDetailsQuery.java  | 6 ++++++
 .../report/service/impl/ReportDeliverServiceImpl.java     | 4 ++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml
index d64746642..63144e956 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml
@@ -400,9 +400,9 @@
         '' start_war_out_time,
         ifnull(dpl.warehouse_entry_time_end, dpl.create_time) warehouse_entry_time_end,
         CASE
-        WHEN lds.driver_signing = 1 THEN
+        WHEN ldl.signfor_state = 1 THEN
         '未签收'
-        WHEN lds.driver_signing = 2 THEN
+        WHEN ldl.signfor_state = 2 THEN
         '已签收'
         END driver_signing,
         ldl.scan_time unload_time,
@@ -568,9 +568,9 @@
         '' start_war_out_time,
         ifnull(dpl.warehouse_entry_time_end, dpl.create_time) warehouse_entry_time_end,
         CASE
-        WHEN lds.driver_signing = 1 THEN
+        WHEN ldl.signfor_state = 1 THEN
         '未签收'
-        WHEN lds.driver_signing = 2 THEN
+        WHEN ldl.signfor_state = 2 THEN
         '已签收'
         END driver_signing,
         ldl.scan_time unload_time,
diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/query/DevilerDetailsQuery.java b/blade-service/logpm-report/src/main/java/com/logpm/report/query/DevilerDetailsQuery.java
index bf5d57826..1986a27b4 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/query/DevilerDetailsQuery.java
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/query/DevilerDetailsQuery.java
@@ -44,4 +44,10 @@ public class DevilerDetailsQuery extends Query {
 	@ApiModelProperty(value = "运单收货人", position = 17)
 	private String consigneeNameRange;
 
+	@ApiModelProperty(value = "签收时间开始（范围）", position = 18)
+	private Date startSjsigningTime;
+
+	@ApiModelProperty(value = "签收时间结束（范围）", position = 19)
+	private Date endSjsigningTime;
+
 }
diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java
index ccf941343..ddd7b4c4a 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java
@@ -214,6 +214,10 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
 		QueryUtil.timeGe("task_time", query.getStartTaskTime(), queryWrapper);
 		// 配送时间结束
 		QueryUtil.timeLe("task_time", query.getEndTaskTime(), queryWrapper);
+		// 签收时间开始
+		QueryUtil.timeGe("sjsigning_time", query.getStartSjsigningTime(), queryWrapper);
+		// 签收时间结束
+		QueryUtil.timeLe("sjsigning_time", query.getEndSjsigningTime(), queryWrapper);
 		// 仓库
 		QueryUtil.splitEqQuery("warehouse_name", query.getWarehouseNameRange(), queryWrapper);
 		// 配送类型