From 7375e74198c0b61a5c795131eb56def62d96d523 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 28 Jul 2023 18:53:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationMapper.java | 2 + .../FinCollectionConfirmationMapper.xml | 25 +- .../FinCollectionConfirmationService.java | 4 + .../FinFundsCarriedForwardApplyService.java | 11 + .../FinSelectedReceivablesDetailedMapper.java | 2 + .../FinSelectedReceivablesDetailedMapper.xml | 491 ++++++++++-------- ...FinSelectedReceivablesDetailedService.java | 5 +- 7 files changed, 310 insertions(+), 230 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java index dbe3d74c66..c8d9fb7893 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java @@ -125,4 +125,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper ${ew.sqlSegment} + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 0a85b5c597..dd1e6c4c63 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -2873,4 +2873,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService selectByOneCollSid(String sid); + + String getBalance(String busSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index 0abdc8232f..b243e65bea 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -25,58 +25,58 @@ SELECT sid, - contractNo AS contractId, - receivablesName AS projectName, - customerPhone AS mobile, - customerName AS `name`, - currentReceivableMoney AS receivable, - contractSid, - VIN AS vin, - furd.busVinSid, - furd.payType, - furd.payTypeKey, - furd.customerSid, - furd.useOrgSid, - furd.reveivableMoney + contractNo AS contractId, + receivablesName AS projectName, + customerPhone AS mobile, + customerName AS `name`, + currentReceivableMoney AS receivable, + contractSid, + VIN AS vin, + furd.busVinSid, + furd.payType, + furd.payTypeKey, + furd.customerSid, + furd.useOrgSid, + furd.reveivableMoney FROM fin_uncollected_receivables_detailed furd ${ew.sqlSegment} and concat(IFNULL(furd.customerName - , '') - , ifnull(furd.contractNo - , '')) LIKE concat('%' - , #{name} - , '%') + , '') + , ifnull(furd.contractNo + , '')) LIKE concat('%' + , #{name} + , '%') and length(furd.busVinSid) - >0 + >0 order by furd.contractNo desc @@ -163,7 +163,7 @@ resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo"> SELECT fsrd.subscriptionMoney FROM fin_selected_receivables_detailed fsrd - LEFT JOIN fin_collection_confirmation fcc ON fcc.sid = fsrd.collSid + LEFT JOIN fin_collection_confirmation fcc ON fcc.sid = fsrd.collSid WHERE fcc.paymentState = 1 @@ -179,16 +179,16 @@ resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo"> select ifnull(sum(dbalance), 0) as subscriptionMoney from (SELECT cast(( - d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance + d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance FROM fin_selected_receivables_detailed d - left join fin_uncollected_receivables_detailed ff on ff.sid = d.receivablesSid - LEFT JOIN ( - SELECT f.busSid, - f.thisUseMoney - FROM fin_funds_carried_forward_veh f - JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid - WHERE fa.`nodeState` != '终止' - ) f ON f.`busSid` = d.`sid` + left join fin_uncollected_receivables_detailed ff on ff.sid = d.receivablesSid + LEFT JOIN ( + SELECT f.busSid, + f.thisUseMoney + FROM fin_funds_carried_forward_veh f + JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid + WHERE fa.`nodeState` != '终止' + ) f ON f.`busSid` = d.`sid` WHERE d.auditState = #{state} and ff.busVinSid = #{busVinSid} and d.contractNo = #{contractNo} @@ -303,16 +303,16 @@ select fd.sid, - fd.receivablesSid, - fd.contractNo, - fd.customerSid, - fd.customerName, - fd.customerPhone, - fd.receivablesName, - fd.currentReceivableMoney, - furd.busVinSid, - furd.payType, - furd.payTypeKey, - fd.subscriptionMoney, - fd.useOrgSid, - fd.subscriptionDate + fd.receivablesSid, + fd.contractNo, + fd.customerSid, + fd.customerName, + fd.customerPhone, + fd.receivablesName, + fd.currentReceivableMoney, + furd.busVinSid, + furd.payType, + furd.payTypeKey, + fd.subscriptionMoney, + fd.useOrgSid, + fd.subscriptionDate from fin_selected_receivables_detailed fd - left join fin_uncollected_receivables_detailed furd on furd.sid = fd.receivablesSid + left join fin_uncollected_receivables_detailed furd on furd.sid = fd.receivablesSid ${ew.sqlSegment} - and fd.receivablesName not like '%订金%' - and fd.auditState = 3 + and fd.receivablesName not like '%订金%' + and fd.auditState = 3 and concat(IFNULL(fd.customerName - , '') - , ifnull(fd.contractNo - , '')) LIKE concat('%' - , #{name} - , '%') + , '') + , ifnull(fd.contractNo + , '')) LIKE concat('%' + , #{name} + , '%') select distinct fd.sid, - fd.receivablesSid, - fd.contractNo, - fd.customerSid, - fd.customerName, - fd.customerPhone, - fd.receivablesName, - fd.currentReceivableMoney, - cast((furd.`reveivableMoney` - COALESCE(df.dbalance, 0)) AS DECIMAL(10, 2)) AS dbalance, - if(fd.currentReceivableMoney <= 0, 0, - if(cast((fd.currentReceivableMoney - fd.subscriptionMoney) AS DECIMAL(10, 2)) <= 0, 0, - cast((fd.currentReceivableMoney - fd.subscriptionMoney) AS DECIMAL(10, 2)))) as reveivableMoney, - furd.busVinSid, - furd.payType, - furd.payTypeKey, - fd.subscriptionMoney, - fd.useOrgSid, - fd.subscriptionDate, - if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) < 1, - if(furd.payTypeKey = 2, RIGHT(bv.temporaryNo, 2), bv.temporaryNo), - RIGHT(bv.linkNo, 8)) as VIN, - CURRENT_DATE() as confirmDate, - 1 as subscribedOf + fd.receivablesSid, + fd.contractNo, + fd.customerSid, + fd.customerName, + fd.customerPhone, + fd.receivablesName, + fd.currentReceivableMoney, + cast((furd.`reveivableMoney` - COALESCE(df.dbalance, 0)) AS DECIMAL(10, 2)) AS dbalance, + if(fd.currentReceivableMoney <= 0, 0, + if(cast((fd.currentReceivableMoney - fd.subscriptionMoney) AS DECIMAL(10, 2)) <= 0, 0, + cast((fd.currentReceivableMoney - fd.subscriptionMoney) AS DECIMAL(10, 2)))) as reveivableMoney, + furd.busVinSid, + furd.payType, + furd.payTypeKey, + fd.subscriptionMoney, + fd.useOrgSid, + fd.subscriptionDate, + if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) < 1, + if(furd.payTypeKey = 2, RIGHT(bv.temporaryNo, 2), bv.temporaryNo), + RIGHT(bv.linkNo, 8)) as VIN, + CURRENT_DATE() as confirmDate, + 1 as subscribedOf from fin_selected_receivables_detailed fd - left join fin_uncollected_receivables_detailed furd on furd.sid = fd.receivablesSid - left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = furd.busVinSid - LEFT JOIN (select sum(dbalance) as dbalance, d.receivablesSid - from (SELECT d.sid, - d.receivablesSid, - d.`collSid`, - cast(( - d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) + - COALESCE(ffa.`useMoney`, 0)) AS DECIMAL(10, 2)) AS dbalance - FROM fin_selected_receivables_detailed d - LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid` - LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney - FROM fin_funds_carried_forward_apply fa - LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid - WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid - WHERE (d.auditState = 1 OR d.auditState = 3) - GROUP BY d.`sid`) d - group by d.receivablesSid + left join fin_uncollected_receivables_detailed furd on furd.sid = fd.receivablesSid + left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = furd.busVinSid + LEFT JOIN (select sum(dbalance) as dbalance, d.receivablesSid + from (SELECT d.sid, + d.receivablesSid, + d.`collSid`, + cast(( + d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) + + COALESCE(ffa.`useMoney`, 0)) AS DECIMAL(10, 2)) AS dbalance + FROM fin_selected_receivables_detailed d + LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid` + LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney + FROM fin_funds_carried_forward_apply fa + LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid + WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid + WHERE (d.auditState = 1 OR d.auditState = 3) + GROUP BY d.`sid`) d + group by d.receivablesSid ) df ON df.receivablesSid = furd.`sid` ${ew.sqlSegment} - and fd.receivablesName not like '%订金%' - and fd.auditState = 3 + and fd.receivablesName not like '%订金%' + and fd.auditState = 3 and concat(IFNULL(fd.customerName - , '') - , ifnull(fd.contractNo - , '') - , ifnull(bv.linkNo - , '')) LIKE concat('%' - , #{name} - , '%') + , '') + , ifnull(fd.contractNo + , '') + , ifnull(bv.linkNo + , '')) LIKE concat('%' + , #{name} + , '%') having dbalance <= 0 @@ -536,11 +563,11 @@ fsrd.purchaseSystemSid, fsrd.purchaseSystemName, ( - fsrd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0) - ) AS balance + fsrd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0) + ) AS balance FROM fin_selected_receivables_detailed fsrd - LEFT JOIN `fin_funds_carried_forward_veh` ffc - ON ffc.`busSid` = fsrd.`sid` + LEFT JOIN `fin_funds_carried_forward_veh` ffc + ON ffc.`busSid` = fsrd.`sid` WHERE fsrd.`sid` = #{busSid} GROUP BY fsrd.sid @@ -550,15 +577,15 @@ select ifnull(sum(dbalance), 0) as subscriptionMoney, d.receivablesSid from (SELECT d.receivablesSid, cast(( - d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance + d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance FROM fin_selected_receivables_detailed d - LEFT JOIN ( - SELECT f.busSid, - f.thisUseMoney - FROM fin_funds_carried_forward_veh f - JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid - WHERE fa.`nodeState` != '终止' - ) f ON f.`busSid` = d.`sid` + LEFT JOIN ( + SELECT f.busSid, + f.thisUseMoney + FROM fin_funds_carried_forward_veh f + JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid + WHERE fa.`nodeState` != '终止' + ) f ON f.`busSid` = d.`sid` WHERE d.auditState = 3 GROUP BY d.`sid`) d WHERE d.receivablesSid = #{receivablesSid} @@ -570,4 +597,14 @@ from fin_selected_receivables_detailed where collSid = #{sid} + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java index d3303dc3de..1f9a9e426b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java @@ -571,7 +571,6 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService wrapper.like("fcc.staffDeptName", query.getStaffDeptName()).or().like("ffcfa.saleDeptName", query.getStaffDeptName())); } @@ -642,4 +641,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService selectByOneCollSid(String sid) { return baseMapper.selectByOneCollSid(sid); } + + public String getBalance(String busSid) { + return baseMapper.getBalance(busSid); + } } \ No newline at end of file