weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
赵辉
2026-03-10 23:16:29 +08:00
parent eabbec3cc1 5be1ea50c2
commit cc17d1d0e2
25 changed files with 427 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml
+4 -1
View File
@@ -141,6 +141,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createByName != null and createByName != ''">
and a.create_by_name like concat('%', #{createByName}, '%')
</if>
<if test="applyNumber != null and applyNumber != ''">
and a.APPLY_NUMBER like concat('%', #{applyNumber}, '%')
</if>
<if test="updateByName != null and updateByName != ''">
and a.update_by_name like concat('%', #{updateByName}, '%')
</if>
@@ -166,7 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND (date_format(a.collection_time,'%Y-%m-%d') >= date_format(#{collectionTimeStart},'%Y-%m-%d')
and date_format(a.collection_time,'%Y-%m-%d') <![CDATA[<=]]> date_format(#{collectionTimeEnd},'%Y-%m-%d'))
</if>
<if test="createTimeStart != null and createTimeEnd != null">
<if test="createTimeStart != null and createTimeEnd != null and createTimeStart != '' and createTimeEnd != ''">
AND (date_format(a.create_time,'%Y-%m-%d') >= date_format(#{createTimeStart},'%Y-%m-%d')
and date_format(a.create_time,'%Y-%m-%d') <![CDATA[<=]]> date_format(#{createTimeEnd},'%Y-%m-%d'))
</if>