aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'demand: 航线查询/导出按财务要求调整' (#44) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/44
This commit is contained in:
heyu 2025-05-29 17:08:01 +08:00
commit b02453b134
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
View File

@ -171,12 +171,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="params.billCode != null and params.billCode != ''"> <if test="params.billCode != null and params.billCode != ''">
and EXISTS( and EXISTS(
select 1 from emis_settle_bill x2,emis_settle_invoice_bill_rel x3,emis_settle_sub_bill x4 select 1 from
where x2.del_flag = '0' and x3.del_flag = '0' and x4.del_flag='0' emis_settle_invoice_rel rel
and a.apply_seq_no=x3.apply_seq_no where a.apply_seq_no=rel.apply_seq_no and
and x2.settle_bill_no=x3.settle_bill_no rel.del_flag = '0'
and x4.settle_bill_no=x2.settle_bill_no and FIND_IN_SET(rel.`bill_no`,#{params.billCode})
and FIND_IN_SET(x4.`bill_code`,#{params.billCode})
) )
<!-- <!--
AND apply_seq_no IN ( AND apply_seq_no IN (
@ -417,16 +416,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if> </if>
<if test="params.billCode != null and params.billCode != ''"> <if test="params.billCode != null and params.billCode != ''">
AND EXISTS ( and EXISTS(
SELECT 1 select 1 from
FROM emis_settle_bill x2 emis_settle_invoice_rel rel
INNER JOIN emis_settle_invoice_bill_rel x3 ON x2.settle_bill_no = x3.settle_bill_no where a.apply_seq_no=rel.apply_seq_no and
INNER JOIN emis_settle_sub_bill x4 ON x2.settle_bill_no = x4.settle_bill_no rel.del_flag = '0'
WHERE x2.del_flag = '0' and FIND_IN_SET(rel.`bill_no`,#{params.billCode})
AND x3.del_flag = '0'
AND x4.del_flag = '0'
AND a.apply_seq_no = x3.apply_seq_no
AND FIND_IN_SET(x4.bill_code, #{params.billCode})
) )
</if> </if>