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:
yuezhihang
2021-11-19 16:51:21 +08:00
parent d23f7478ae 3121c1be9a
commit 8572e2a650
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+6 -6
View File
@@ -754,9 +754,9 @@
<!-- 标准编号111 --> <!-- 标准编号111 -->
<if test="page.standNumber != null and page.standNumber != ''"> <if test="page.standNumber != null and page.standNumber != ''">
and ( and (
(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-', (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
SAR_STANDARDS_INFO.STAND_YEAR) like concat(concat('%',#{page.standNumber}),'%') and SAR_STANDARDS_INFO.STAND_YEAR != '') SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '')
or (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER) like concat(concat('%',#{page.standNumber}),'%') or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ',''))
and SAR_STANDARDS_INFO.STAND_YEAR = '') and SAR_STANDARDS_INFO.STAND_YEAR = '')
or (stand_name like concat(concat('%',#{page.standNumber}),'%')) or (stand_name like concat(concat('%',#{page.standNumber}),'%'))
) )
@@ -995,9 +995,9 @@
<if test="mark == 999 "> <if test="mark == 999 ">
and sar_standards_info.ID in (select distinct stand_id from sar_stand_items) and sar_standards_info.ID in (select distinct stand_id from sar_stand_items)
</if> </if>
<if test='page.orderByA != null and page.orderByA != "" and page.order1 != null and page.order1 != "" <if test='(page.orderByA != null and page.orderByA != "" and page.order1 != null and page.order1 != "")
and page.standType != null and page.standType != "" '> or (page.standType != null and page.standType != "") '>
<include refid="standSort_in"/> <include refid="standSort_in"/>
</if> </if>
limit ${page.pager.startIndex-1},${page.pageSize} limit ${page.pager.startIndex-1},${page.pageSize}
</select> </select>