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

Merge pull request 'demand: TMS系统 - 客户账单管理 - 航信开票记录 - 界面优化如下图所示' (#22) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/22
This commit is contained in:
smshen 2025-05-12 18:27:03 +08:00
commit a433b83299
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,13 +73,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE ir.apply_seq_no = a.apply_seq_no) as send_month, WHERE ir.apply_seq_no = a.apply_seq_no) as send_month,
(SELECT b.settle_type (SELECT b.settle_type
FROM emis_settle_bill b FROM emis_settle_bill b
INNER JOIN emis_settle_invoice_record r ON b.settle_bill_no = r.settle_bill_no INNER JOIN emis_settle_invoice_bill_rel r ON b.settle_bill_no = r.settle_bill_no
WHERE r.apply_seq_no = a.apply_seq_no WHERE r.apply_seq_no = a.apply_seq_no
LIMIT 1) as settle_type, LIMIT 1) as settle_type,
CASE CASE
WHEN (SELECT b.settle_type WHEN (SELECT b.settle_type
FROM emis_settle_bill b FROM emis_settle_bill b
INNER JOIN emis_settle_invoice_record r ON b.settle_bill_no = r.settle_bill_no INNER JOIN emis_settle_invoice_bill_rel r ON b.settle_bill_no = r.settle_bill_no
WHERE r.apply_seq_no = a.apply_seq_no WHERE r.apply_seq_no = a.apply_seq_no
LIMIT 1) = '2' LIMIT 1) = '2'
THEN ( THEN (
@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
) )
FROM emis_waybill w FROM emis_waybill w
INNER JOIN emis_settle_invoice_rel ir ON w.bill_code = ir.bill_no INNER JOIN emis_settle_invoice_rel ir ON w.bill_code = ir.bill_no
INNER JOIN emis_settle_invoice_record r ON ir.apply_seq_no = r.apply_seq_no INNER JOIN emis_settle_invoice_bill_rel r ON ir.apply_seq_no = r.apply_seq_no
INNER JOIN emis_settle_bill b ON r.settle_bill_no = b.settle_bill_no INNER JOIN emis_settle_bill b ON r.settle_bill_no = b.settle_bill_no
WHERE ir.apply_seq_no = a.apply_seq_no WHERE ir.apply_seq_no = a.apply_seq_no
) )