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_3' into develop_master

Browse Source
This commit is contained in:
yuezhihang
2022-01-27 09:34:43 +08:00
parent a89e642f00 4379ede739
commit e9ddea77da
10 changed files with 195 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml
+50 -4
View File
@@ -83,7 +83,7 @@
where stand_id = #{standId} and valid_flag=0
</select>
<select id="getMenuByStandId" resultType="com.adc.da.slrs.sarStandMenu.entity.SarStandMenu">
SELECT
SELECT
SAR_STAND_MENU.valid_flag as validFlag,
menu_id as menuId,
stand_id as standId,
@@ -92,9 +92,55 @@
FROM
SAR_STAND_MENU
LEFT JOIN ts_resource ON SAR_STAND_MENU.MENU_ID = ts_resource.ID
WHERE
stand_id = #{standId}
AND SAR_STAND_MENU.VALID_FLAG = 0
<where>
SAR_STAND_MENU.VALID_FLAG = 0
<if test="standId !=null and stand != ''">
AND stand_id = #{standId}
</if>
<if test="standCode !=null and standCode != ''">
AND STAND_ID =
(
SELECT
id
FROM
sar_standards_info AS sarInfo
WHERE
VALID_FLAG = '0'
AND
(
(
REPLACE (
concat(
sarInfo.STAND_SORT,
' ',
sarInfo.STAND_NUMBER,
'-',
sarInfo.STAND_YEAR
),
' ',
''
) = REPLACE (
#{standCode},' ', '')
AND sarInfo.STAND_YEAR != ''
)
OR (
REPLACE (
concat(
sarInfo.STAND_SORT,
sarInfo.STAND_NUMBER
),
' ',
''
) = REPLACE (#{standCode},' ', '')
)
)
)
</if>
</where>
</select>