diff --git a/project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java b/project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java index cae545f4..44589d1d 100644 --- a/project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java +++ b/project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java @@ -38,6 +38,13 @@ public class SpdmTaskListReq { */ private String exeStatus; + /** + * 异常状态 + */ + private String expStatusStr; + + private Integer expStatusValue; + private List exeStatusList; /** diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java index e99eb07a..6ddfad5c 100644 --- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java @@ -1172,6 +1172,9 @@ public class TaskServiceImpl implements ITaskService { // 2. 基础任务列表查询 req.setUserId(userId); + if (StringUtils.isNotBlank(req.getExpStatusStr())) { + req.setExpStatusValue(Integer.parseInt(req.getExpStatusStr())); + } StopWatch stopWatch = new StopWatch("所有任务方法计时"); stopWatch.start("查所有任务"); List allTaskList = mapper.optimisedGtTaskList(tenantId, req); diff --git a/project/src/main/resources/mapper/SimulationTaskMapper.xml b/project/src/main/resources/mapper/SimulationTaskMapper.xml index 3cdae4f9..96caa469 100644 --- a/project/src/main/resources/mapper/SimulationTaskMapper.xml +++ b/project/src/main/resources/mapper/SimulationTaskMapper.xml @@ -773,6 +773,9 @@ and progress = #{req.progress} + + and expStatus = #{req.expStatusValue} + and ( @@ -893,6 +896,9 @@ and progress = #{req.progress} + + and expStatus = #{req.expStatusValue} + and (