diff --git a/src/main/resources/mapper/BankbillHistoryMapper.xml b/src/main/resources/mapper/BankbillHistoryMapper.xml index cc3d91d..6e9f271 100644 --- a/src/main/resources/mapper/BankbillHistoryMapper.xml +++ b/src/main/resources/mapper/BankbillHistoryMapper.xml @@ -75,23 +75,6 @@ and C_SHDDH like concat('%',concat(#{likeFiled},'%')) - and C_SHDDH in ( - select C_SHDDH - from bankbill_history - - - and C_JYRQ >= #{startTime} - - - and C_JYRQ <= #{endTime} - - - and C_ZFFS = #{c_zffs} - - - group by C_SHDDH - having ROUND(SUM(CAST(C_JYJE AS DECIMAL(18,2))), 2) != 0 - ) order by C_JYRQ,C_JYSJ diff --git a/src/main/resources/mapper/TransactionDetailMapper.xml b/src/main/resources/mapper/TransactionDetailMapper.xml index b1532c6..ab4a65e 100644 --- a/src/main/resources/mapper/TransactionDetailMapper.xml +++ b/src/main/resources/mapper/TransactionDetailMapper.xml @@ -217,7 +217,7 @@ from (select * from hisbill_history where trade_date = #{trade_date} and payType!=#{cash_code} and PayMethod != '2' -- 排除不参与对账的记录 and PayType != '9' -- 排除账户支付,不参与常规对账 - and PayType != '10' -- 排除统筹支付,不参与常规对账 + and PayType != '10' and payType!=#{military_code} @@ -236,15 +236,7 @@ select * from bankbill_history where C_JYRQ = #{trade_date} and (is_inpatient is null or is_inpatient = '0') - and C_SHDDH in ( - select C_SHDDH - from bankbill_history - where C_JYRQ = #{trade_date} - and (is_inpatient is null or is_inpatient = '0') - group by C_SHDDH - having ROUND(SUM(CAST(C_JYJE AS DECIMAL(18,2))), 2) != 0 - ) - ) b -- 排除住院订单,且排除同订单号正负抵消为0的记录 + ) b on a.PlatformTransId = b.C_SHDDH and a.TradingStatus = b.C_JYLX and ROUND(CAST(a.Amount AS DECIMAL(18,2)), 2) = ROUND(CAST(b.C_JYJE AS DECIMAL(18,2)), 2) where a.PlatformTransId is null