diff --git a/ruoyi-admin/src/main/resources/mapper/in/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/MydoJobMapper.xml
index 4ab6875..a258985 100644
--- a/ruoyi-admin/src/main/resources/mapper/in/MydoJobMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/MydoJobMapper.xml
@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and priority = #{priority} and height = #{height} and weight = #{weight}
- and create_time between #{params.beginCreateTime} and #{params.endCreateTime}
+ and mydo_job.create_time between #{params.beginCreateTime} and #{params.endCreateTime} and entrance_id = #{entranceId} and exit_id = #{exitId} and dept_name like concat('%', #{deptName}, '%')
@@ -430,7 +430,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and priority = #{priority} and height = #{height} and weight = #{weight}
- and create_time between #{params.beginCreateTime} and #{params.endCreateTime}
+ and mydo_job.create_time between #{params.beginCreateTime} and #{params.endCreateTime} and entrance_id = #{entranceId} and exit_id = #{exitId} and dept_name like concat('%', #{deptName}, '%')
@@ -484,7 +484,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and priority = #{priority} and height = #{height} and weight = #{weight}
- and create_time between #{params.beginCreateTime} and #{params.endCreateTime}
+ and mydo_job.create_time between #{params.beginCreateTime} and #{params.endCreateTime} and entrance_id = #{entranceId} and exit_id = #{exitId} and dept_name like concat('%', #{deptName}, '%')
@@ -594,7 +594,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and priority = #{priority} and height = #{height} and weight = #{weight}
- and create_time between #{params.beginCreateTime} and #{params.endCreateTime}
+ and mydo_job.create_time between #{params.beginCreateTime} and #{params.endCreateTime} and entrance_id = #{entranceId} and exit_id = #{exitId} and dept_name like concat('%', #{deptName}, '%')
@@ -622,7 +622,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and priority = #{priority} and height = #{height} and weight = #{weight}
- and create_time between #{params.beginCreateTime} and #{params.endCreateTime}
+ and mydo_job.create_time between #{params.beginCreateTime} and #{params.endCreateTime} and entrance_id = #{entranceId} and exit_id = #{exitId} and dept_name like concat('%', #{deptName}, '%')
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/in/job/mapper/MydoJobMapperSqlTest.java b/ruoyi-admin/src/test/java/com/ruoyi/in/job/mapper/MydoJobMapperSqlTest.java
index e9b474f..497ea6f 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/in/job/mapper/MydoJobMapperSqlTest.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/in/job/mapper/MydoJobMapperSqlTest.java
@@ -88,6 +88,19 @@ class MydoJobMapperSqlTest {
.contains(" and warehouse_id = #{warehouseId}");
}
+ @Test
+ void outboundListQualifiesCreateTimeAfterJoiningDispatchOutbox() throws Exception {
+ String xml = Files.readString(resolveMapperXml());
+ for (String selectId : new String[] {"selectMydoJobList", "selectInMydoJobList",
+ "selectInventoryInMydoJobList", "selectOutMydoJobList", "selectInventoryOutMydoJobList"}) {
+ String activeList = section(xml, "