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

1、任务列表、getTaskTree，根据学科过滤 bugfix

Browse Source
This commit is contained in:
lidongyang
2026-02-03 20:29:46 +08:00
parent 0ca037d615
commit 5ae41005f0
5 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,6 @@ public class ProjectTreeReq {
@JsonProperty(value = "tag10")
private String tag10;
private String filterDiscipline;
private List<String> filterDiscipline;
}

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

@@ -17,7 +17,7 @@ public class ProjectTreeTagReq {
private String projectNodeId;
private String filterDiscipline;
private List<String> filterDiscipline;
/**

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

@@ -143,6 +143,6 @@ public class SpdmTaskListReq {
private Long userId;
private String filterDiscipline;
private List<String> filterDiscipline;
}

10
project/src/main/resources/mapper/SimulationProjectMapper.xml
View File

@@ -695,8 +695,14 @@
<bind name="searchKey10" value="'%' + req.tag10 + '%'"/>
and tag10 like #{searchKey10}
</if>
<if test="req.filterDiscipline != null and req.filterDiscipline != ''">
and (discipline = #{req.filterDiscipline} or discipline = '' or discipline = null)
<if test="req.filterDiscipline != null and req.filterDiscipline.size > 0">
and discipline in (
<foreach collection='req.filterDiscipline' item='disciplineId' index='index' separator=','>
#{disciplineId}
</foreach>
)
or discipline = '' or discipline = null
</if>
</where>
</select>

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

@@ -572,8 +572,13 @@
]]>
</if>
<if test="req.filterDiscipline != null and req.filterDiscipline != ''">
and (discipline = #{req.filterDiscipline} or discipline = '' or discipline = null)
<if test="req.filterDiscipline != null and req.filterDiscipline.size > 0">
and discipline in (
<foreach collection='req.filterDiscipline' item='disciplineId' index='index' separator=','>
#{disciplineId}
</foreach>
)
or discipline = '' or discipline = null
</if>
<!-- <if test='req.sortOrder != null and req.sortOrder == "0"'>-->
@@ -683,9 +688,13 @@
and STR_TO_DATE(finish_time,'%Y-%m-%d %H:%i:%s') <= #{req.finishETime}
]]>
</if>
<if test="req.filterDiscipline != null and req.filterDiscipline != ''">
and (discipline = #{req.filterDiscipline} or discipline = '' or discipline = null)
<if test="req.filterDiscipline != null and req.filterDiscipline.size > 0">
and discipline in (
<foreach collection='req.filterDiscipline' item='disciplineId' index='index' separator=','>
#{disciplineId}
</foreach>
)
or discipline = '' or discipline = null
</if>
<!-- <if test='req.sortOrder != null and req.sortOrder == "0"'>-->