Commit 6f68fd6131f9a7f2e3e796d4dedc270b5558205e

Authored by YunaiV
1 parent a0a7a94f

✨ feat(mes): 添加任务状态列表支持,优化任务查询功能

yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskPageReqVO.java
@@ -8,6 +8,7 @@ import lombok.ToString; @@ -8,6 +8,7 @@ import lombok.ToString;
8 import org.springframework.format.annotation.DateTimeFormat; 8 import org.springframework.format.annotation.DateTimeFormat;
9 9
10 import java.time.LocalDateTime; 10 import java.time.LocalDateTime;
  11 +import java.util.List;
11 12
12 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 13 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
13 14
@@ -38,6 +39,9 @@ public class MesProTaskPageReqVO extends PageParam { @@ -38,6 +39,9 @@ public class MesProTaskPageReqVO extends PageParam {
38 @Schema(description = "任务状态", example = "0") 39 @Schema(description = "任务状态", example = "0")
39 private Integer status; 40 private Integer status;
40 41
  42 + @Schema(description = "任务状态列表(IN 查询)", example = "[0, 1, 2]")
  43 + private List<Integer> statuses;
  44 +
41 @Schema(description = "创建时间") 45 @Schema(description = "创建时间")
42 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) 46 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
43 private LocalDateTime[] createTime; 47 private LocalDateTime[] createTime;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
@@ -28,6 +28,7 @@ public interface MesProTaskMapper extends BaseMapperX&lt;MesProTaskDO&gt; { @@ -28,6 +28,7 @@ public interface MesProTaskMapper extends BaseMapperX&lt;MesProTaskDO&gt; {
28 .eqIfPresent(MesProTaskDO::getProcessId, reqVO.getProcessId()) 28 .eqIfPresent(MesProTaskDO::getProcessId, reqVO.getProcessId())
29 .eqIfPresent(MesProTaskDO::getWorkstationId, reqVO.getWorkstationId()) 29 .eqIfPresent(MesProTaskDO::getWorkstationId, reqVO.getWorkstationId())
30 .eqIfPresent(MesProTaskDO::getStatus, reqVO.getStatus()) 30 .eqIfPresent(MesProTaskDO::getStatus, reqVO.getStatus())
  31 + .inIfPresent(MesProTaskDO::getStatus, reqVO.getStatuses())
31 .betweenIfPresent(MesProTaskDO::getCreateTime, reqVO.getCreateTime()) 32 .betweenIfPresent(MesProTaskDO::getCreateTime, reqVO.getCreateTime())
32 .orderByDesc(MesProTaskDO::getId)); 33 .orderByDesc(MesProTaskDO::getId));
33 } 34 }