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

Merge remote-tracking branch 'origin/develop_master' into develop_master

Browse Source
This commit is contained in:
liyawei
2022-11-07 16:40:53 +08:00
parent 07c8d1dcea 58e0240749
commit b8bfa39b88
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
+16 -2
View File
@@ -418,7 +418,7 @@
</select>
<select id="selectListByids" resultType="java.lang.String">
select distinct sar_stand_project_relation.project_id as projectId
from sar_stand_project_relation
from sar_stand_project_relation
where sar_stand_project_relation.stand_id in
<foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
#{item}
@@ -439,6 +439,9 @@
<if test="sarStandProjectLibrary.categoryName != null and sarStandProjectLibrary.categoryName != ''">
and sar_stand_project_library.category_name=#{sarStandProjectLibrary.categoryName}
</if>
<if test="sarStandProjectLibrary.projectGroup != null and sarStandProjectLibrary.projectGroup != ''">
and sar_stand_project_library.project_group like concat(concat('%',#{sarStandProjectLibrary.projectGroup}),'%')
</if>
GROUP BY sar_stand_project_library.project_group
limit ${(current-1) * size},${size}
</select>
@@ -457,7 +460,12 @@
</if>
<if test="sarStandProjectLibrary.categoryName != null and sarStandProjectLibrary.categoryName != ''">
and sar_stand_project_library.category_name=#{sarStandProjectLibrary.categoryName}
</if> )a
</if>
<if test="sarStandProjectLibrary.projectGroup != null and sarStandProjectLibrary.projectGroup != ''">
and sar_stand_project_library.project_group like concat(concat('%',#{sarStandProjectLibrary.projectGroup}),'%')
</if>
GROUP BY sar_stand_project_library.project_group
)a
</select>
<select id="queryProjects"
resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary">
@@ -480,6 +488,9 @@
<if test="sarStandProjectLibrary.projectStatus != null and sarStandProjectLibrary.projectStatus != ''">
and sar_stand_project_library.project_status=#{sarStandProjectLibrary.projectStatus}
</if>
<if test="sarStandProjectLibrary.projectName != null and sarStandProjectLibrary.projectName != ''">
and sar_stand_project_library.project_name like concat(concat('%',#{sarStandProjectLibrary.projectName}),'%')
</if>
<if test="null != groups and groups.size()>0">
and sar_stand_project_library.project_group in
<foreach collection="groups" index="index" item="item" open="(" separator="," close=")">
@@ -509,6 +520,9 @@
<if test="sarStandProjectLibrary.projectStatus != null and sarStandProjectLibrary.projectStatus != ''">
and sar_stand_project_library.project_status=#{sarStandProjectLibrary.projectStatus}
</if>
<if test="sarStandProjectLibrary.projectName != null and sarStandProjectLibrary.projectName != ''">
and sar_stand_project_library.project_name like concat(concat('%',#{sarStandProjectLibrary.projectName}),'%')
</if>
<if test="null != groups and groups.size()>0">
and sar_stand_project_library.project_group in
<foreach collection="groups" index="index" item="item" open="(" separator="," close=")">