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 026020fa..b56b93a6 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 @@ -152,6 +152,9 @@ public class SpdmTaskListReq { private List filterDiscipline; + // 二次查询过滤学科 + private String discipline; + private String taskId; /** 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 168df881..f5850525 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 @@ -1177,6 +1177,10 @@ public class TaskServiceImpl implements ITaskService { } StopWatch stopWatch = new StopWatch("所有任务方法计时"); stopWatch.start("查所有任务"); + // 二次查询过滤学科 + if (StringUtils.isNotBlank(req.getDiscipline())) { + req.setFilterDiscipline(Collections.singletonList(req.getDiscipline())); + } List allTaskList = mapper.optimisedGtTaskList(tenantId, req); stopWatch.stop(); JSONObject jsonObject = buildEmptyJsonResp(req);