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

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

Browse Source
This commit is contained in:
gaojiabao
2023-06-15 15:05:33 +08:00
parent 61c5225319 6411deb8a6
commit 76b2eea8f2
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/pdmcSarLawsStandInfo/PDMCSarLawsStandInfoMapper.xml
+13 -11
View File
@@ -18,23 +18,25 @@
<resultMap id="BaseResultMapExcel" type="com.adc.da.slrs.pdmcSarLawsStandInfo.entity.PDMCSarLawsStandInfo" >
</resultMap>
<sql id="Base_Column_List_Show" >
DISTINCT sar_standards_info.ID,
sar_stand_menu.MENU_ID as MENU_ID,
sar_standards_info.STAND_NUMBER as STAND_NUMBER,
sar_standards_info.STAND_NAME as STAND_NAME,
sar_standards_info.STAND_EN_NAME as STAND_EN_NAME,
sar_standards_info.STAND_STATE as TEXT_STATE,
sar_standards_info.ISSUE_TIME as ISSUE_TIME,
sar_standards_info.REPLACE_STAND_NUM as REPLACE_STAND_NUM,
concat('https://srms.foton.com.cn/#/otherStandardDetails/',sar_standards_info.ID,'/',sar_standards_info.STAND_TYPE,'_STAND') as LINK
DISTINCT ssi.ID,
ssm.MENU_ID as MENU_ID,
CONCAT(CASE WHEN ssi.STAND_SORT is NULL THEN '' ELSE ssi.STAND_SORT END,
IFNULL(CONCAT(' ', CASE WHEN ssi.STAND_NUMBER='' THEN NULL ELSE ssi.STAND_NUMBER END), ''),
IFNULL(CONCAT('-', CASE WHEN ssi.STAND_YEAR='' THEN NULL ELSE ssi.STAND_YEAR END), '')) as STAND_NUMBER,
ssi.STAND_NAME as STAND_NAME,
ssi.STAND_EN_NAME as STAND_EN_NAME,
ssi.STAND_STATE as TEXT_STATE,
ssi.ISSUE_TIME as ISSUE_TIME,
ssi.REPLACE_STAND_NUM as REPLACE_STAND_NUM,
concat('https://srms.foton.com.cn/#/otherStandardDetails/',ssi.ID,'/',ssi.STAND_TYPE,'_STAND') as LINK
</sql>
<select id="getSarStandardsInfo" resultMap="BaseResultMap">
select
<include refid="Base_Column_List_Show"/>
from sar_standards_info
left join sar_stand_menu on sar_standards_info.id=sar_stand_menu.STAND_ID order by sar_standards_info.ID asc
from sar_standards_info ssi
left join sar_stand_menu ssm on ssi.id=ssm.STAND_ID order by ssi.ID asc
</select>
<select id="getSarStandardsCount" resultType="java.lang.Integer">
select