diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml index 0aa0f35d54..7a1bd16767 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml @@ -201,21 +201,27 @@ 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 @@ -155,7 +155,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 @@ -171,7 +171,7 @@ resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo"> select fd.* from fin_selected_receivables_detailed fd - left join fin_uncollected_receivables_detailed fud on fud.sid = fd.receivablesSid + left join fin_uncollected_receivables_detailed fud on fud.sid = fd.receivablesSid where fd.contractNo = #{contractNo} and fud.busVinSid = #{busVinSid} and fd.auditState = #{state} @@ -285,8 +285,8 @@ @@ -303,8 +303,7 @@ FROM fin_selected_receivables_detailed WHERE receivablesSid = #{ysSid} AND auditState = 3 - ORDER BY createTime DESC - LIMIT 1 + ORDER BY createTime DESC LIMIT 1 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 != '订金' - and fd.auditState = 3 + and fd.receivablesName != '订金' + 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 d.sid, - d.receivablesSid, - d.`collSid`, - cast((sum(d.`subscriptionMoney`) - COALESCE(SUM(f.`thisUseMoney`), 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` - where d.auditState = 1 - or d.auditState = 3 - 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 d.sid, + d.receivablesSid, + d.`collSid`, + cast((sum(d.`subscriptionMoney`) - COALESCE(SUM(f.`thisUseMoney`), 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` + where d.auditState = 1 + or d.auditState = 3 + GROUP BY d.`receivablesSid` ) df ON df.receivablesSid = furd.`sid` ${ew.sqlSegment} - and fd.receivablesName != '订金' - and fd.auditState = 3 + and fd.receivablesName != '订金' + 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 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 8d5364333b..38073324f8 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 @@ -585,23 +585,17 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService wrapper.like("ferd.contractNo", query.getName()).or().like("fcc.staffDeptName", query.getName()).or().like("ffcfa.saleDeptName",query.getName()).or().like("ffcfa.staffName",query.getName()).or().like("fcc.staffName", query.getName()).or().like("ferd.customerName", query.getName()).or().like("ferd.customerPhone", query.getName()).or().like("ferd.VIN", query.getName())); } + qw.groupBy("ferd.sid"); + qw.having("reveivableMoney >=",query.getBalanceSmallMoney()).having("reveivableMoney <=",query.getBalanceBigMoney()); IPage page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.noOutVehRecPageList(page, qw); for (FinSelectReceivablesDetailedWCKCLRKVo record : pagging.getRecords()) { String useOrgSid = record.getUseOrgSid(); String useOrgName = sysOrganizationFeign.fetchBySid(useOrgSid).getData().getName(); record.setUseOrgName(useOrgName); - if (StringUtils.isBlank(record.getReveivableMoney())){ - record.setReveivableMoney(record.getSubscriptionMoney()); - } } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java index d8baf23534..9829b75bce 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java @@ -399,16 +399,10 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService idCardImages = new ArrayList<>(); List comFkFiles = new ArrayList<>(); for (CommonAppendixVo commonAppendixVo : data1) { - String filePath = commonAppendixVo.getFilePath(); - String urlPrefix = fileUploadComponent.getUrlPrefix(); - filePath = urlPrefix + filePath; - idCardImages.add(filePath); + idCardImages.add(commonAppendixVo.getFilePath()); } for (CommonAppendixVo commonAppendixVo : data2) { - String filePath = commonAppendixVo.getFilePath(); - String urlPrefix = fileUploadComponent.getUrlPrefix(); - filePath = urlPrefix + filePath; - comFkFiles.add(filePath); + comFkFiles.add(commonAppendixVo.getFilePath()); } List loanPreloanCreditPeoDetailsVos = loanPreloanCreditPeoService.fetchByMainSid(sid); List idCardPeoImages = new ArrayList<>(); @@ -418,10 +412,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService data3 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery3).getData(); for (CommonAppendixVo commonAppendixVo : data3) { - String filePath = commonAppendixVo.getFilePath(); - String urlPrefix = fileUploadComponent.getUrlPrefix(); - filePath = urlPrefix + filePath; - idCardPeoImages.add(filePath); + idCardPeoImages.add(commonAppendixVo.getFilePath()); } loanPreloanCreditPeoDetailsVo.setIdCardImages(idCardPeoImages); }