toolchaintechnologycenter/spdm-backend
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix[project]: 任务列表、数据查询二次查询修改

Browse Source
This commit is contained in:
lidongyang
2026-03-19 09:48:40 +08:00
parent d9eec35d7f
commit db8c865c88
7 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
project/src/main/java/com/sdm/project/model/po/PerformanceNodePo.java
View File

@@ -36,6 +36,11 @@ public class PerformanceNodePo extends NodeAllBase {
*/
private String performanceName;
/**
* 学科名称
*/
private String discipline;
private String performanceType;
private String standard;
private String highValue;

2
project/src/main/java/com/sdm/project/model/po/TaskRunPo.java
View File

@@ -78,6 +78,8 @@ public class TaskRunPo extends BaseEntity {
private String disciplineName;
private String discipline;
/**
* 仿真负责人

2
project/src/main/java/com/sdm/project/model/req/SpdmAnalysisPerformanceListReq.java
View File

@@ -140,4 +140,6 @@ public class SpdmAnalysisPerformanceListReq extends BaseEntity {
@JsonProperty(value = "pMembers")
private Long pMembers;
private String discipline;
}

2
project/src/main/java/com/sdm/project/model/req/SpdmAnalysisRunListReq.java
View File

@@ -143,4 +143,6 @@ public class SpdmAnalysisRunListReq extends BaseEntity {
@JsonProperty(value = "pMembers")
private Long pMembers;
private String discipline;
}

2
project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java
View File

@@ -153,7 +153,7 @@ public class SpdmTaskListReq {
private List<String> filterDiscipline;
// 二次查询过滤学科
private String ownDisciplineName;
private String discipline;
private String taskId;

8
project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
View File

@@ -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<SpdmTaskVo> 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<SpdmAnalysisTaskVo> taskVoList;
List<SpdmAnalysisTaskVo> 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<String> nickNameList = new ArrayList<>();

4
project/src/main/resources/mapper/SimulationTaskMapper.xml
View File

@@ -1152,8 +1152,8 @@
<if test="req.expStatus != null and req.expStatus != ''">
and st.expStatus = #{req.expStatus}
</if>
<if test="req.ownDisciplineName != null and req.ownDisciplineName != ''">
<bind name="searchKey17" value="'%' + req.ownDisciplineName + '%'"/>
<if test="req.discipline != null and req.discipline != ''">
<bind name="searchKey17" value="'%' + req.discipline + '%'"/>
and st.discipline like #{searchKey17}
</if>
<if test="req.reportTemplate != null and req.reportTemplate != ''">