From 3a8740d57f188262c97c796f72b53240c34bc713 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Sun, 15 Mar 2026 14:06:48 +0800 Subject: [PATCH] =?UTF-8?q?PDA=E7=AB=AF=E5=87=BA=E5=BA=93=E4=BA=A4?= =?UTF-8?q?=E6=8E=A5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliveTask/repository/todo/DeliveTaskDO.java | 3 +++ .../interfaces/dto/deliveTask/DeliveTaskDTO.java | 3 +++ .../mapper/deliveTask/DeliveTaskMapper.xml | 14 ++++++++++++++ 3 files changed, 20 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/todo/DeliveTaskDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/todo/DeliveTaskDO.java index 8da01aba6..9e2aac9ec 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/todo/DeliveTaskDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/todo/DeliveTaskDO.java @@ -115,4 +115,7 @@ public class DeliveTaskDO extends BaseVOEntity { @ApiModelProperty("查询类型 1-指派给我的 2-任务") @Excel(name = "查询类型 1-指派给我的 2-任务") private Long tabType; + + @ApiModelProperty("交接查询类型(taskType=7时生效): 1-列表(未交接) 2-历史(已交接)，不传默认1") + private Integer handoverQueryType; } diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/deliveTask/DeliveTaskDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/deliveTask/DeliveTaskDTO.java index 8f39e5d31..40cacf6bd 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/deliveTask/DeliveTaskDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/deliveTask/DeliveTaskDTO.java @@ -115,4 +115,7 @@ public class DeliveTaskDTO extends BaseVOEntity { @ApiModelProperty("查询类型 1-指派给我的 2-任务") @Excel(name = "查询类型 1-指派给我的 2-任务") private Long tabType; + + @ApiModelProperty("交接查询类型(taskType=7时生效): 1-列表(未交接) 2-历史(已交接)，不传默认1") + private Integer handoverQueryType; } diff --git a/mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml b/mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml index 729830731..196979e7f 100644 --- a/mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml +++ b/mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml @@ -91,6 +91,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and task_type = #{taskType} + + + and EXISTS (SELECT 1 FROM handover_task_order hto WHERE hto.task_number = delive_task.tracking_number AND hto.del_flag = 1 AND hto.status = 1) + + + and EXISTS (SELECT 1 FROM handover_task_order hto WHERE hto.task_number = delive_task.tracking_number AND hto.del_flag = 1 AND hto.status = 2) + and task_status = #{taskStatus} @@ -158,6 +165,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and task_type = #{taskType} + + + and EXISTS (SELECT 1 FROM handover_task_order hto WHERE hto.task_number = delive_task.tracking_number AND hto.del_flag = 1 AND hto.status = 1) + + + and EXISTS (SELECT 1 FROM handover_task_order hto WHERE hto.task_number = delive_task.tracking_number AND hto.del_flag = 1 AND hto.status = 2) + and task_status = #{taskStatus}