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!366
This commit is contained in:
王夏晖
2022-01-11 13:39:28 +08:00
parent 914d2c3d06 1b2c595f50
commit 925ab6219e
9 changed files with 116 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+19 -1
View File
@@ -475,9 +475,27 @@
and DATE_FORMAT(issue_time,'%Y-%m-%D') >= #{issueTime1}
</if>
<if test="issueTime2 != null" >
-- and to_char(issue_time,'YYYY-MM-DD') &lt;= #{issueTime2}
and DATE_FORMAT(issue_time,'%Y-%m-%D') &lt;= #{issueTime2}
</if>
<!-- 日期查询 -->
<if test="startPutTime != null" >
and DATE_FORMAT(put_time,'%Y-%m-%d') &gt;= #{startPutTime}
</if>
<if test="endPutTime != null" >
and DATE_FORMAT(put_time,'%Y-%m-%d') &lt;= #{endPutTime}
</if>
<if test="startIssueTime != null" >
and DATE_FORMAT(issue_time,'%Y-%m-%d') &gt;= #{startIssueTime}
</if>
<if test="endIssueTime != null" >
and DATE_FORMAT(issue_time,'%Y-%m-%d') &lt;= #{endIssueTime}
</if>
<!-- 目录判断 -->
<if test="menuId != null and menuId !='nomenu' and menuAllChildrenIdList != null" >
and SAR_BUSS_STAND_MENU.MENU_ID in