diff --git a/project/src/main/java/com/sdm/project/model/po/PerformanceNodePo.java b/project/src/main/java/com/sdm/project/model/po/PerformanceNodePo.java index e1a3997b..3f5f2279 100644 --- a/project/src/main/java/com/sdm/project/model/po/PerformanceNodePo.java +++ b/project/src/main/java/com/sdm/project/model/po/PerformanceNodePo.java @@ -36,6 +36,11 @@ public class PerformanceNodePo extends NodeAllBase { */ private String performanceName; + /** + * 学科名称 + */ + private String discipline; + private String performanceType; private String standard; private String highValue; diff --git a/project/src/main/java/com/sdm/project/model/po/TaskRunPo.java b/project/src/main/java/com/sdm/project/model/po/TaskRunPo.java index 0a94bf0a..9f8e8b4b 100644 --- a/project/src/main/java/com/sdm/project/model/po/TaskRunPo.java +++ b/project/src/main/java/com/sdm/project/model/po/TaskRunPo.java @@ -78,6 +78,8 @@ public class TaskRunPo extends BaseEntity { private String disciplineName; + private String discipline; + /** * 仿真负责人 diff --git a/project/src/main/java/com/sdm/project/model/req/SpdmAnalysisPerformanceListReq.java b/project/src/main/java/com/sdm/project/model/req/SpdmAnalysisPerformanceListReq.java index 1ee9a750..b80b0046 100644 --- a/project/src/main/java/com/sdm/project/model/req/SpdmAnalysisPerformanceListReq.java +++ b/project/src/main/java/com/sdm/project/model/req/SpdmAnalysisPerformanceListReq.java @@ -140,4 +140,6 @@ public class SpdmAnalysisPerformanceListReq extends BaseEntity { @JsonProperty(value = "pMembers") private Long pMembers; + private String discipline; + } diff --git a/project/src/main/java/com/sdm/project/model/req/SpdmAnalysisRunListReq.java b/project/src/main/java/com/sdm/project/model/req/SpdmAnalysisRunListReq.java index f770e4f3..287008f3 100644 --- a/project/src/main/java/com/sdm/project/model/req/SpdmAnalysisRunListReq.java +++ b/project/src/main/java/com/sdm/project/model/req/SpdmAnalysisRunListReq.java @@ -143,4 +143,6 @@ public class SpdmAnalysisRunListReq extends BaseEntity { @JsonProperty(value = "pMembers") private Long pMembers; + private String discipline; + } 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 80fccd32..69959e56 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 @@ -153,7 +153,7 @@ public class SpdmTaskListReq { private List filterDiscipline; // 二次查询过滤学科 - private String ownDisciplineName; + 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 5cafa51a..19b3f324 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 @@ -1178,8 +1178,8 @@ public class TaskServiceImpl implements ITaskService { StopWatch stopWatch = new StopWatch("所有任务方法计时"); stopWatch.start("查所有任务"); // 二次查询过滤学科 - if (StringUtils.isNotBlank(req.getOwnDisciplineName())) { - req.setFilterDiscipline(Collections.singletonList(req.getOwnDisciplineName())); + if (StringUtils.isNotBlank(req.getDiscipline())) { + req.setFilterDiscipline(Collections.singletonList(req.getDiscipline())); } List allTaskList = mapper.optimisedGtTaskList(tenantId, req); stopWatch.stop(); @@ -2009,6 +2009,7 @@ public class TaskServiceImpl implements ITaskService { continue; } performanceNodePo.setPerformanceName(performanceNodePo.getNodeName()); + performanceNodePo.setDiscipline(eachTaskVo.getDiscipline()); TagReq taskTagReq = eachTaskVo.getTagReq(); performanceNodePo.setTagReq(taskTagReq); eachTaskNodeMemberPoList = memberMap.get(eachTaskVo.getUuid()); @@ -2132,7 +2133,7 @@ public class TaskServiceImpl implements ITaskService { List taskVoList; List allTaskVoList = new ArrayList<>(); if (StringUtils.isNotBlank(taskNodeId)) { - allTaskVoList = mapper.getAnalysisTask(taskNodeId,req.getOwnDisciplineName()); + allTaskVoList = mapper.getAnalysisTask(taskNodeId,req.getDiscipline()); } else { taskVoList = mapper.taskListByTag(req, tenantId, new ArrayList<>(), pos, limit,userId, tag1KeyList,tag2KeyList,tag3KeyList,tag4KeyList,tag5KeyList,tag6KeyList,tag7KeyList @@ -2609,6 +2610,7 @@ public class TaskServiceImpl implements ITaskService { taskTagReq.setRunName(taskRunPo.getRunName()); taskRunPo.setTagReq(taskTagReq); taskRunPo.setPMembers(eachTaskVo.getPMembers()); + taskRunPo.setDiscipline(eachTaskVo.getDiscipline()); eachTaskNodeMemberPoList = memberMap.get(eachTaskVo.getUuid()); if (CollectionUtils.isNotEmpty(eachTaskNodeMemberPoList)) { List nickNameList = new ArrayList<>(); diff --git a/project/src/main/resources/mapper/SimulationTaskMapper.xml b/project/src/main/resources/mapper/SimulationTaskMapper.xml index 573545bd..6b289674 100644 --- a/project/src/main/resources/mapper/SimulationTaskMapper.xml +++ b/project/src/main/resources/mapper/SimulationTaskMapper.xml @@ -1152,8 +1152,8 @@ and st.expStatus = #{req.expStatus} - - + + and st.discipline like #{searchKey17}