FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 78639

Browse Source 
体系搜索--弹窗中缺少体系结构查询字段
This commit is contained in:
mzaxd
2023-11-25 21:20:00 +08:00
parent 24746a13c1
commit cd8645bab9
3 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java
+13
View File
@@ -30,6 +30,12 @@ public class StandSystemDTO {
@ApiModelProperty(value = "体系结构")
private String standSystem;
@ApiModelProperty(value = "体系结构ID(树状结构选取)")
private String standSystemId;
@ApiModelProperty(value = "体系结构IDList(树状结构选取)")
private List<String> standSystemIdList;
@ApiModelProperty(value = "标准Id")
private String standId;
@@ -156,4 +162,11 @@ public class StandSystemDTO {
this.endReleaseDateString = sdf.format(endReleaseDate);
}
}
public void setStandSystemIdList(String standSystemId) {
this.standSystemId = standSystemId;
if (standSystemId != null) {
this.standSystemIdList = java.util.Arrays.asList(standSystemId.split(","));
}
}
}
adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml
+19 -7
View File
@@ -220,14 +220,19 @@
<if test="param.standName != null and param.standName != ''">
AND gb.STAND_NAME LIKE CONCAT('%',#{param.standName},'%')
</if>
<!--发布时间-->
<if test="param.startReleaseDateString != null and param.startReleaseDateString != '' and
param.endReleaseDateString != null and param.endReleaseDateString != ''">
AND gb.ISSUE_TIME BETWEEN #{param.startReleaseDateString} AND #{param.endReleaseDateString}
<!-- 发布时间 -->
<if test="param.startReleaseDateString != null and param.startReleaseDateString != ''">
AND gb.ISSUE_TIME >= #{param.startReleaseDateString}
</if>
<!--实施日期-->
<if test="param.startImplementDate != null and param.endImplementDate != null">
AND gb.PUT_TIME BETWEEN #{param.startImplementDate} AND #{param.endImplementDate}
<if test="param.endReleaseDateString != null and param.endReleaseDateString != ''">
AND gb.ISSUE_TIME &lt;= CONCAT(#{param.endReleaseDateString}, ' 23:59:59')
</if>
<!-- 实施日期 -->
<if test="param.startImplementDate != null">
AND gb.PUT_TIME >= #{param.startImplementDate}
</if>
<if test="param.endImplementDate != null">
AND gb.PUT_TIME &lt;= CONCAT(#{param.endImplementDate}, ' 23:59:59')
</if>
<!--代替标准-->
<if test="param.replaceStandardNo != null and param.replaceStandardNo != ''">
@@ -249,6 +254,13 @@
<if test="dataSource != null and dataSource != ''">
AND gb.STAND_TYPE = #{dataSource}
</if>
<!--体系结构树搜索-->
<if test="param.standSystemIdList != null and param.standSystemIdList.size() > 0">
AND gb.ID IN
<foreach item="item" index="index" collection="param.standSystemIdList" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.selectIdList != null and param.selectIdList.size() > 0">
AND gb.ID IN
<foreach item="item" index="index" collection="param.selectIdList" open="(" separator="," close=")">
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+18 -5
View File
@@ -1328,12 +1328,18 @@
AND es.STAND_NAME LIKE CONCAT('%',#{param.standName},'%')
</if>
<!--发布时间-->
<if test="param.startReleaseDate != null and param.endReleaseDate != null">
AND es.ISSUE_TIME BETWEEN #{param.startReleaseDate} AND #{param.endReleaseDate}
<if test="param.startReleaseDate != null">
AND es.ISSUE_TIME >= #{param.startImplementDate}
</if>
<!--实施日期-->
<if test="param.startImplementDate != null and param.endImplementDate != null">
AND es.PUT_TIME BETWEEN #{param.startImplementDate} AND #{param.endImplementDate}
<if test="param.endReleaseDate != null">
AND es.ISSUE_TIME &lt;= CONCAT(#{param.endReleaseDate}, ' 23:59:59')
</if>
<!-- 实施日期 -->
<if test="param.startImplementDate != null">
AND es.PUT_TIME >= #{param.startImplementDate}
</if>
<if test="param.endImplementDate != null">
AND es.PUT_TIME &lt;= CONCAT(#{param.endImplementDate}, ' 23:59:59')
</if>
<!--代替标准-->
<if test="param.replaceStandardNo != null and param.replaceStandardNo != ''">
@@ -1351,6 +1357,13 @@
<if test="param.dataSource != null and param.dataSource != ''">
AND 'ENTERPRISE' = #{param.dataSource}
</if>
<!--体系结构树搜索-->
<if test="param.standSystemIdList != null and param.standSystemIdList.size() > 0">
AND es.ID IN
<foreach item="item" index="index" collection="param.standSystemIdList" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.selectIdList != null and param.selectIdList.size() > 0">
AND es.ID IN
<foreach item="item" index="index" collection="param.selectIdList" open="(" separator="," close=")">