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

Merge branch 'develop_3' into 'develop_master'

Browse Source 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!299
This commit is contained in:
王夏晖
2021-12-20 17:02:18 +08:00
parent 09e7e2ffee ab3e3374b8
commit 28e5923544
5 changed files with 64 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+19
View File
@@ -832,9 +832,19 @@
<if test="page.standYear != null and page.standYear != ''">
and SAR_STANDARDS_INFO.STAND_YEAR = #{page.standYear}
</if>
<!-- 发布日期日期-->
<if test="page.issueTime != null and page.issueTime != ''">
and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME ,'%Y-%m-%d') = #{page.issueTime}
</if>
<!-- 范围查询 发布日期日期-->
<if test="page.startIssueTime != null and page.startIssueTime != '' and page.endIssueTime != null and page.endIssueTime != ''">
and
DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME ,'%Y-%m-%d')
between
DATE_FORMAT(#{page.startIssueTime} ,'%Y-%m-%d')
and
DATE_FORMAT(#{page.endIssueTime} ,'%Y-%m-%d')
</if>
<!--内容摘要-->
<if test="page.synopsis != null and page.synopsis != ''" >
AND dbms_lob.instr(SYNOPSIS, #{page.synopsis} ,1,1) > 0
@@ -964,6 +974,15 @@
<if test="issueTime != null and issueTime != ''">
and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME ,'%Y-%m-%d') = #{issueTime}
</if>
<if test="startIssueTime != null and startIssueTime != '' and endIssueTime != null and endIssueTime != ''">
and
DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME ,'%Y-%m-%d')
between
DATE_FORMAT( #{startIssueTime} ,'%Y-%m-%d')
and
DATE_FORMAT( #{startIssueTime} ,'%Y-%m-%d')
</if>
<!--内容摘要-->
<if test="synopsis != null and synopsis != ''" >
AND dbms_lob.instr(SYNOPSIS, #{synopsis} ,1,1) > 0