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

Merge branch 'develop_migration' into 'develop_master'

Browse Source 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!237
This commit is contained in:
super_liu
2021-11-17 12:00:19 +08:00
parent 478cdd4c87 464451ab82
commit 0d324cc6ae
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+12 -7
View File
@@ -603,7 +603,7 @@
when 'HJ' THEN 7 when 'HJ' THEN 7
ELSE 8 ELSE 8
END, END,
sar_standards_info.stand_sort ASC,sar_standards_info.id sar_standards_info.stand_sort ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id
</if> </if>
<if test='page.standType != null and page.standType == "FOREIGN"'> <if test='page.standType != null and page.standType == "FOREIGN"'>
CASE sar_standards_info.stand_sort CASE sar_standards_info.stand_sort
@@ -633,7 +633,7 @@
when 'ADR' THEN 23 when 'ADR' THEN 23
ELSE 24 ELSE 24
END, END,
sar_standards_info.stand_sort ASC,sar_standards_info.id sar_standards_info.stand_sort ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id
</if> </if>
</sql> </sql>
<sql id="standSort_out"> <sql id="standSort_out">
@@ -1034,9 +1034,15 @@
and stand_type = #{standType} and stand_type = #{standType}
</if> </if>
<if test="standNumber != null"> <if test="standNumber != null">
and ((concat(dicstandSort.DIC_TYPE_NAME,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-', and (
SAR_STANDARDS_INFO.STAND_YEAR) = ( #{standNumber}) and SAR_STANDARDS_INFO.STAND_YEAR != '') ( ( #{standNumber}) like CONCAT('%',dicstandSort.DIC_TYPE_NAME,'%')
or (concat(dicstandSort.DIC_TYPE_NAME,' ',SAR_STANDARDS_INFO.STAND_NUMBER) = ( #{standNumber}) and
( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_NUMBER,'%')
and
( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_YEAR,'%') and SAR_STANDARDS_INFO.STAND_YEAR != '')
or (( #{standNumber}) like CONCAT('%',dicstandSort.DIC_TYPE_NAME,'%')
and
( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_NUMBER,'%')
and SAR_STANDARDS_INFO.STAND_YEAR = '') and SAR_STANDARDS_INFO.STAND_YEAR = '')
) )
</if> </if>
@@ -1137,8 +1143,7 @@
${orderByA} ${order1}, ${orderByA} ${order1},
</if> </if>
<include refid="standSort_out"/> <include refid="standSort_out"/>
a.issue_time is null a.STAND_YEAR DESC,a.id
,a.issue_time desc,a.id
</select> </select>
<select id="selectStandardsInfoByKey" resultMap="BaseResultMap" parameterType="java.lang.String"> <select id="selectStandardsInfoByKey" resultMap="BaseResultMap" parameterType="java.lang.String">