Merge branch 'dev' into pre-production

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,

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;
+
 }

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);
 		// 配送类型