From db8a8a03df34cfd22f1be0f7514654e54a94fc0b Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 29 May 2025 16:38:29 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E8=BF=94=E5=88=A9=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=B8=8D=E5=88=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FactoryDaliyReportFeign.java | 4 + .../api/factoryDailyReport/FgsVo.java | 30 +++ .../api/factoryDailyReport/FgsYearVo.java | 18 ++ .../FactoryDaliyReportMapper.java | 7 + .../FactoryDaliyReportMapper.xml | 181 ++++++++++++++++++ .../FactoryDaliyReportRest.java | 10 +- .../FactoryDaliyReportService.java | 55 ++++++ 7 files changed, 301 insertions(+), 4 deletions(-) create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsVo.java create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsYearVo.java diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportFeign.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportFeign.java index 5ae1744350..ddc99f5d81 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportFeign.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportFeign.java @@ -34,6 +34,10 @@ public interface FactoryDaliyReportFeign { @ResponseBody ResultBean sybBrands(@RequestParam("divisionSid") String divisionSid); + @GetMapping("/list3") + @ResponseBody + ResultBean list3(@RequestParam("divisionSid") String divisionSid); + } diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsVo.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsVo.java new file mode 100644 index 0000000000..d2f9b2f439 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsVo.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.reportcenter.api.factoryDailyReport; + +import lombok.Data; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/5/29 + **/ +@Data +public class FgsVo { + + private String title; + + private List row1; + + private List row2; + + private List row3; + private List row4; + private List row5; + private List row6; + private List row7; + private List row8; + private List row9; + private List row10; + private List row11; +} diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsYearVo.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsYearVo.java new file mode 100644 index 0000000000..0a521a0f06 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsYearVo.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.reportcenter.api.factoryDailyReport; + +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/5/29 + **/ +@Data +public class FgsYearVo { + + private String name; + + private String title; + + private String linkSid; +} diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.java index c82ec6bd4f..2821e4909c 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.java @@ -3,6 +3,7 @@ package com.yxt.anrui.reportcenter.biz.factoryDailyReport; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportVo; +import com.yxt.anrui.reportcenter.api.factoryDailyReport.FgsYearVo; import com.yxt.anrui.reportcenter.api.factoryDailyReport.YearAllVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -28,4 +29,10 @@ public interface FactoryDaliyReportMapper { List getBrandsNameList(String divisionSid); List getSybList2(String divisionSid); + + List getUseOrgNameList(String divisionSid); + + List getRow2(String divisionSid); + + List getFgsList(String divisionSid); } diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.xml index b1cbc88295..29d74b3053 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.xml +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.xml @@ -430,4 +430,185 @@ ORDER BY a.brandSid desc, a.year DESC; + + + + + + \ No newline at end of file diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportRest.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportRest.java index 791df0e1f4..303097d0a3 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportRest.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportRest.java @@ -1,9 +1,6 @@ package com.yxt.anrui.reportcenter.biz.factoryDailyReport; -import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportFeign; -import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportQuery; -import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportVo; -import com.yxt.anrui.reportcenter.api.factoryDailyReport.SybVo; +import com.yxt.anrui.reportcenter.api.factoryDailyReport.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -50,5 +47,10 @@ public class FactoryDaliyReportRest implements FactoryDaliyReportFeign { return factoryDaliyReportService.getSybBrands(divisionSid); } + @Override + public ResultBean list3(String divisionSid) { + return factoryDaliyReportService.list3(divisionSid); + } + } diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java index 99bd5e4faa..7055e6db8e 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java @@ -273,4 +273,59 @@ public class FactoryDaliyReportService { } return rb.success().setData(sysVo); } + + public ResultBean list3(String divisionSid) { + ResultBean rb = ResultBean.fireFail(); + FgsVo fgsVo = new FgsVo(); + fgsVo.setTitle("分公司报表"); + //先查询有哪些分公司以及分公司下的年份 + List useOrgNameList = factoryDaliyReportMapper.getUseOrgNameList(divisionSid); + List row2 = factoryDaliyReportMapper.getRow2(divisionSid); + List factoryDaliyReportVoList = factoryDaliyReportMapper.getFgsList(divisionSid); + factoryDaliyReportVoList.removeAll(Collections.singleton(null)); + if(!factoryDaliyReportVoList.isEmpty()){ + for (int i = 0; i < factoryDaliyReportVoList.size(); i++) { + FactoryDaliyReportVo factoryDaliyReportVo = factoryDaliyReportVoList.get(i); + factoryDaliyReportVo.setEstimate(DecimalUtil.format(factoryDaliyReportVo.getEstimate())); + factoryDaliyReportVo.setUpload(DecimalUtil.format(factoryDaliyReportVo.getUpload())); + factoryDaliyReportVo.setAdjust(DecimalUtil.format(factoryDaliyReportVo.getAdjust())); + factoryDaliyReportVo.setNotUploadMoney(DecimalUtil.format(factoryDaliyReportVo.getNotUploadMoney())); + factoryDaliyReportVo.setUnuploaded_rebate(DecimalUtil.format(factoryDaliyReportVo.getUnuploaded_rebate())); + factoryDaliyReportVo.setFee(DecimalUtil.format(factoryDaliyReportVo.getFee())); + factoryDaliyReportVo.setExpense_payment(DecimalUtil.format(factoryDaliyReportVo.getExpense_payment())); + factoryDaliyReportVo.setPending_payment(DecimalUtil.format(factoryDaliyReportVo.getPending_payment())); + factoryDaliyReportVo.setOffset_payment(DecimalUtil.format(factoryDaliyReportVo.getOffset_payment())); + } + //预提 + List row3 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getEstimate).collect(Collectors.toList()); + //上传 + List row4 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getUpload).collect(Collectors.toList()); + //调整 + List row5 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getAdjust).collect(Collectors.toList()); + //未上传 + List row6 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getNotUploadMoney).collect(Collectors.toList()); + //其中返利 + List row7 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getUnuploaded_rebate).collect(Collectors.toList()); + //其中费用 + List row8 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getFee).collect(Collectors.toList()); + //支出 + List row9 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getExpense_payment).collect(Collectors.toList()); + //待支付 + List row10 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getPending_payment).collect(Collectors.toList()); + //抵顶 + List row11 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getOffset_payment).collect(Collectors.toList()); + fgsVo.setRow1(useOrgNameList); + fgsVo.setRow2(row2); + fgsVo.setRow3(row3); + fgsVo.setRow4(row4); + fgsVo.setRow5(row5); + fgsVo.setRow6(row6); + fgsVo.setRow7(row7); + fgsVo.setRow8(row8); + fgsVo.setRow9(row9); + fgsVo.setRow10(row10); + fgsVo.setRow11(row11); + } + return rb.success().setData(fgsVo); + } } From 555a61f562d4ea68127d6556812e38e60505a375 Mon Sep 17 00:00:00 2001 From: ligaode Date: Thu, 29 May 2025 16:57:00 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanBePadsincereVehMapper.java | 2 +- .../LoanBePadsincereVehMapper.xml | 7 +- .../LoanBePadsincereVehService.java | 2 +- .../LoanRepaymentHistoryMapper.java | 2 + .../LoanRepaymentHistoryMapper.xml | 14 ++ .../LoanRepaymentHistoryService.java | 3 + .../LoanSecondarySalesNotApplyService.java | 156 +++++++++++++++--- 7 files changed, 159 insertions(+), 27 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehMapper.java index 5bcbbaca14..9c4b9ac5ad 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehMapper.java @@ -77,5 +77,5 @@ public interface LoanBePadsincereVehMapper extends BaseMapper selByBankCont(@Param("applySid") String applySid, @Param("busSid") String busSid); - BigDecimal selByBusVinSid(String busVinSid); + List selByBusVinSid(String busVinSid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehMapper.xml index c32bf98669..96e0757733 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehMapper.xml @@ -20,11 +20,14 @@ and paySid = #{paySid} - SELECT - IF(SUM(padMoney), SUM(padMoney), 0) + IF(SUM(padMoney), SUM(padMoney), 0) AS padMoney, + period FROM loan_be_padsincere_veh WHERE saleVehSid = #{busVinSid} + GROUP BY period \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehService.java index 06f305f901..f9e3e89e03 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehService.java @@ -116,7 +116,7 @@ public class LoanBePadsincereVehService extends MybatisBaseService selByBusVinSid(String busVinSid) { return baseMapper.selByBusVinSid(busVinSid); } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java index ca2de25866..aefa0d0b68 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java @@ -89,4 +89,6 @@ public interface LoanRepaymentHistoryMapper extends BaseMapper repaymentStatistics2(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); List repaymentStatisticsList(@Param(Constants.WRAPPER)QueryWrapper qw); + + List selHistoryByPlanSids(@Param("jhmxSids") List jhmxSids); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml index 8f21499082..95bc583020 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml @@ -1121,4 +1121,18 @@ ${ew.sqlSegment} + + diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java index 0fb5140195..7f8d77ba48 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java @@ -2422,4 +2422,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService selHistoryByPlanSids(List jhmxSids) { + return baseMapper.selHistoryByPlanSids(jhmxSids); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java index f44a412637..9fa71bd441 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java @@ -65,8 +65,10 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDetailsVo; import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; +import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply; import com.yxt.anrui.riskcenter.api.loanrepurchasecost.LoanRepurchaseCost; @@ -81,6 +83,7 @@ import com.yxt.anrui.riskcenter.api.loansecondarysalesnotveh.LoanSecondarySalesN import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVehVo; import com.yxt.anrui.riskcenter.biz.loanbepadsincereveh.LoanBePadsincereVehService; import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; +import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService; import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService; import com.yxt.anrui.riskcenter.biz.loanrepurchaseapply.LoanRepurchaseApplyService; import com.yxt.anrui.riskcenter.biz.loanrepurchasecost.LoanRepurchaseCostService; @@ -173,6 +176,8 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { LoanSecondarySalesNotApplyQuery query = pq.getParams(); @@ -600,8 +605,8 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService busVinSidList = loanSecondarySalesNotVehService.selectByMainSid(businessSid); busVinSidList.removeAll(Collections.singleton(null)); - if(!busVinSidList.isEmpty()){ - pushRiskToFin2(finalLoanSecondarySalesNotApply,busVinSidList); + if (!busVinSidList.isEmpty()) { + pushRiskToFin2(finalLoanSecondarySalesNotApply, busVinSidList); } }); } catch (Exception e) { @@ -638,16 +643,16 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService loanRepaymentPlanDetails = loanRepaymentPlanDetailsService.selectByBusVinSid(loanSecondarySalesNotVehDetailsVo.getBusVinSid()); //查询车辆是否有垫款金额 - BigDecimal dkje = loanBePadsincereVehService.selByBusVinSid(loanSecondarySalesNotVehDetailsVo.getBusVinSid()); + List loanBePadsincereVehDetailsVos = loanBePadsincereVehService.selByBusVinSid(loanSecondarySalesNotVehDetailsVo.getBusVinSid()); //获取明细sid集合 List jhmxSids = loanRepaymentPlanDetails.stream().map(c -> c.getSid()). collect(Collectors.toList()); //查询金融应收所有应收款 List data = finUncollectedReceivablesDetailedJRFeign.selByBusSid(jhmxSids).getData(); - if (!data.isEmpty()){ + if (!data.isEmpty()) { for (FinUncollectedReceivablesDetailedJR datum : data) { List finSelectedReceivablesDetaileds = finSelectedReceivablesDetailedFeign.fetchByReceivablesSid(datum.getSid()).getData(); - if (finSelectedReceivablesDetaileds.isEmpty()){ + if (finSelectedReceivablesDetaileds.isEmpty()) { List selectList = new ArrayList<>(); FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed(); fin.setCreateBySid(loanSecondarySalesNotApply.getCreateBySid()); @@ -668,9 +673,9 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService selectList = new ArrayList<>(); FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed(); fin.setCreateBySid(loanSecondarySalesNotApply.getCreateBySid()); @@ -695,6 +700,111 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService loanRepaymentHistories = loanRepaymentHistoryService.selHistoryByPlanSids(jhmxSids); + if (loanRepaymentHistories.isEmpty()) { + for (LoanRepaymentPlanDetails plan : loanRepaymentPlanDetails) { + List histories = new ArrayList<>(); + LoanRepaymentHistory history = new LoanRepaymentHistory(); + history.setCreateBySid(loanSecondarySalesNotApply.getCreateBySid()); + history.setDataTime(new Date()); + history.setUpdateState("1"); + history.setUpdateTime(new Date()); + history.setActualDate(plan.getDueDate()); + history.setActualMoney(plan.getDueMoney()); + history.setBuckleKey("003"); + history.setBuckle("审核通过"); + history.setReturnWayKey(""); + history.setReturnWay(""); + history.setPayState(0); + history.setIsEnable(3); + history.setPlanDetailSid(plan.getSid()); + history.setScheduleSid(""); + history.setRemarks("认损"); + histories.add(history); + loanRepaymentHistoryService.saveList(histories); + } + } else { + for (LoanRepaymentPlanDetails plan : loanRepaymentPlanDetails) { + List loanRepaymentHistories1 = loanRepaymentHistoryService.selHistoryByPlanSid(plan.getSid()); + BigDecimal sh = loanRepaymentHistories1.stream().map(LoanRepaymentHistory::getActualMoney).reduce(BigDecimal.ZERO, BigDecimal::add); + if (!loanBePadsincereVehDetailsVos.isEmpty()) { + List periods = loanBePadsincereVehDetailsVos.stream().map(v -> v.getPeriod()).collect(Collectors.toList()); + if (periods.contains(plan.getPeriod())) { + for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVos) { + if (plan.getPeriod().equals(loanBePadsincereVehDetailsVo.getPeriod())) { + sh = sh.subtract(new BigDecimal(loanBePadsincereVehDetailsVo.getPadMoney())); + if (sh.compareTo(plan.getDueMoney()) == -1) { + List histories = new ArrayList<>(); + LoanRepaymentHistory history = new LoanRepaymentHistory(); + history.setCreateBySid(loanSecondarySalesNotApply.getCreateBySid()); + history.setDataTime(new Date()); + history.setUpdateState("1"); + history.setUpdateTime(new Date()); + history.setActualDate(plan.getDueDate()); + history.setActualMoney(plan.getDueMoney().subtract(sh)); + history.setBuckleKey("003"); + history.setBuckle("审核通过"); + history.setReturnWayKey(""); + history.setReturnWay(""); + history.setPayState(0); + history.setIsEnable(3); + history.setPlanDetailSid(plan.getSid()); + history.setScheduleSid(""); + history.setRemarks("认损"); + histories.add(history); + loanRepaymentHistoryService.saveList(histories); + } + } + } + } else { + if (sh.compareTo(plan.getDueMoney()) == -1) { + List histories = new ArrayList<>(); + LoanRepaymentHistory history = new LoanRepaymentHistory(); + history.setCreateBySid(loanSecondarySalesNotApply.getCreateBySid()); + history.setDataTime(new Date()); + history.setUpdateState("1"); + history.setUpdateTime(new Date()); + history.setActualDate(plan.getDueDate()); + history.setActualMoney(plan.getDueMoney().subtract(sh)); + history.setBuckleKey("003"); + history.setBuckle("审核通过"); + history.setReturnWayKey(""); + history.setReturnWay(""); + history.setPayState(0); + history.setIsEnable(3); + history.setPlanDetailSid(plan.getSid()); + history.setScheduleSid(""); + history.setRemarks("认损"); + histories.add(history); + loanRepaymentHistoryService.saveList(histories); + } + } + }else { + if (sh.compareTo(plan.getDueMoney()) == -1) { + List histories = new ArrayList<>(); + LoanRepaymentHistory history = new LoanRepaymentHistory(); + history.setCreateBySid(loanSecondarySalesNotApply.getCreateBySid()); + history.setDataTime(new Date()); + history.setUpdateState("1"); + history.setUpdateTime(new Date()); + history.setActualDate(plan.getDueDate()); + history.setActualMoney(plan.getDueMoney().subtract(sh)); + history.setBuckleKey("003"); + history.setBuckle("审核通过"); + history.setReturnWayKey(""); + history.setReturnWay(""); + history.setPayState(0); + history.setIsEnable(3); + history.setPlanDetailSid(plan.getSid()); + history.setScheduleSid(""); + history.setRemarks("认损"); + histories.add(history); + loanRepaymentHistoryService.saveList(histories); + } + } + } + } } } @@ -708,7 +818,7 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService voucherResultDetailDtos = new ArrayList<>(); SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(loanSecondarySalesNotApply.getCreateDeptSid()).getData(); - for (int i = 0; i < busVinSidList.size(); i++){ + for (int i = 0; i < busVinSidList.size(); i++) { String busVinSid = busVinSidList.get(i); //ToDo: BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData(); @@ -766,25 +876,25 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService0){ + if (loanSecondarySalesCost.getBankSettleCost().compareTo(BigDecimal.ZERO) > 0) { all = all.add(loanSecondarySalesCost.getBankSettleCost()).subtract(new BigDecimal(subAll)); } @@ -807,11 +917,11 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService0){//贷方 + if (cssMoney.compareTo(BigDecimal.ZERO) > 0) {//贷方 Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); - voucherResultDetailDtoDf.setSummary(customerNumber+"扣回车辆再次销售-不追偿处理"); + voucherResultDetailDtoDf.setSummary(customerNumber + "扣回车辆再次销售-不追偿处理"); voucherResultDetailDtoDf.setSubjectNo("1201.03.04.01"); //核算部门 voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode()); @@ -820,7 +930,7 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService0){ + if (zjzyfMoney.compareTo(BigDecimal.ZERO) > 0) { Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); - voucherResultDetailDtoDf.setSummary(customerNumber+"扣回车辆再次销售-不追偿减免资金占用费"); + voucherResultDetailDtoDf.setSummary(customerNumber + "扣回车辆再次销售-不追偿减免资金占用费"); voucherResultDetailDtoDf.setSubjectNo("2191.05.00"); //核算部门 voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode()); @@ -840,7 +950,7 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService Date: Thu, 29 May 2025 16:58:53 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BA=8C?= =?UTF-8?q?=E6=AC=A1=E9=94=80=E5=94=AE=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=AB=9E=E4=BB=B7=E7=BB=93=E6=9E=9C=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSecondarySalesApplyService.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java index 28128377dd..a6af5d0836 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java @@ -1286,6 +1286,24 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService Date: Thu, 29 May 2025 17:00:35 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BA=8C?= =?UTF-8?q?=E6=AC=A1=E9=94=80=E5=94=AE=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=AB=9E=E4=BB=B7=E7=BB=93=E6=9E=9C=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/loansecondarysalesapply/SecondarySalesAppVo.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/SecondarySalesAppVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/SecondarySalesAppVo.java index 0c4fd70296..6f8d4ebf03 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/SecondarySalesAppVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/SecondarySalesAppVo.java @@ -85,4 +85,6 @@ public class SecondarySalesAppVo { @ApiModelProperty("销售订单sid") private String salesOrderSid; + @ApiModelProperty("竞价结果") + private String result; } From 8d7ed04d757cc139f667f4e0be6d8e1c523d2806 Mon Sep 17 00:00:00 2001 From: ligaode Date: Thu, 29 May 2025 17:35:02 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanLawsuitSubApplyService.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitsubapply/LoanLawsuitSubApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitsubapply/LoanLawsuitSubApplyService.java index 19eb2c677d..ca58fcd4e8 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitsubapply/LoanLawsuitSubApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitsubapply/LoanLawsuitSubApplyService.java @@ -315,7 +315,20 @@ public class LoanLawsuitSubApplyService extends MybatisBaseService Date: Fri, 30 May 2025 08:47:15 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctedReceivablesDetailedJRFeignFallback.java | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeignFallback.java index 60e6955511..865c339f6c 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeignFallback.java @@ -34,19 +34,6 @@ import org.springframework.stereotype.Component; import java.math.BigDecimal; import java.util.List; -/** - * Project: anrui-fin(销售相关)
- * File: FinUncollectedReceivablesDetailedFeignFallback.java
- * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeignFallback
- * Description: 应收未收款项明细表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-04-12 17:57:01
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Component public class FinUncollectedReceivablesDetailedJRFeignFallback implements FinUncollectedReceivablesDetailedJRFeign { @@ -85,4 +72,9 @@ public class FinUncollectedReceivablesDetailedJRFeignFallback implements FinUnco public ResultBean getUnJrByPayCostTitleKeyAndBusSid(String key, String busSid) { return null; } + + @Override + public ResultBean> selByBusSid(List busSids) { + return null; + } } From e7222e52dddb7a7f07b0a97d1d7ab3d09108fffd Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 30 May 2025 09:41:31 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BA=8C?= =?UTF-8?q?=E6=AC=A1=E9=94=80=E5=94=AE=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=AB=9E=E4=BB=B7=E7=BB=93=E6=9E=9C=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../terminal/api/risk/secondarysales/SecondarySalesAppVos.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/SecondarySalesAppVos.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/SecondarySalesAppVos.java index ae47d1da27..5543f2ce64 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/SecondarySalesAppVos.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/SecondarySalesAppVos.java @@ -96,4 +96,7 @@ public class SecondarySalesAppVos { private String salesOrderSid; private CarModelVo jrfa; + + @ApiModelProperty("竞价结果") + private String result; } From ba565dc0a85b0adaae722b3a8c940e064e2d6e71 Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 30 May 2025 10:44:54 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSecondarySalesCostAppVo.java | 6 ++++++ .../api/loansecondarysalescost/LoanSecondarySalesCost.java | 3 ++- .../loansecondarysalescost/LoanSecondarySalesCostVo.java | 4 ++-- .../api/risk/secondarysales/SecondarySalesCostAppVo.java | 5 +++++ .../biz/risk/secondarysales/SecondarySalesService.java | 5 +++++ 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesCostAppVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesCostAppVo.java index bbb2a9d531..35ac1e8ea0 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesCostAppVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesCostAppVo.java @@ -4,6 +4,7 @@ import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -71,4 +72,9 @@ public class LoanSecondarySalesCostAppVo { private String vehicleEvaluation; private String filesss; + + @ApiModelProperty("是否追偿1是0否") + private String isRecovery; + @ApiModelProperty("购方应交总金额") + private String purMeetCost; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescost/LoanSecondarySalesCost.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescost/LoanSecondarySalesCost.java index 8fb4f22405..32bf07bc3f 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescost/LoanSecondarySalesCost.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescost/LoanSecondarySalesCost.java @@ -72,5 +72,6 @@ public class LoanSecondarySalesCost extends BaseEntity { private BigDecimal vehicleEvaluation; @ApiModelProperty("是否追偿1是0否") private Integer isRecovery; - + @ApiModelProperty("购方应交总金额") + private BigDecimal purMeetCost; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescost/LoanSecondarySalesCostVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescost/LoanSecondarySalesCostVo.java index 68615ff81c..3a8c0c7785 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescost/LoanSecondarySalesCostVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescost/LoanSecondarySalesCostVo.java @@ -72,7 +72,7 @@ public class LoanSecondarySalesCostVo { private String vehicleEvaluation; @ApiModelProperty("是否追偿1是0否") private Integer isRecovery; - + @ApiModelProperty("购方应交总金额") + private BigDecimal purMeetCost; private String filesss; - } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/SecondarySalesCostAppVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/SecondarySalesCostAppVo.java index 69de01a9db..18ff74b183 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/SecondarySalesCostAppVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/SecondarySalesCostAppVo.java @@ -97,4 +97,9 @@ public class SecondarySalesCostAppVo { @ApiModelProperty("车辆评估") private String vehicleEvaluation; + + @ApiModelProperty("是否追偿") + private String isRecovery; + @ApiModelProperty("购方应交总金额") + private String purMeetCost; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java index 4540b1fdcb..f5bceb7bd7 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java @@ -122,6 +122,11 @@ public class SecondarySalesService { } SecondarySalesAppVos secondarySalesAppVos = new SecondarySalesAppVos(); BeanUtil.copyProperties(resultBean.getData(), secondarySalesAppVos); + if ("1".equals(secondarySalesAppVos.getLoanSecondarySalesCost().getIsRecovery())){ + secondarySalesAppVos.getLoanSecondarySalesCost().setIsRecovery("是"); + }else { + secondarySalesAppVos.getLoanSecondarySalesCost().setIsRecovery("否"); + } secondarySalesAppVos.setPublishInfo(secondarySalesAppVos.getCreateDept() + "-" + secondarySalesAppVos.getCreateByName()); if (StringUtils.isNotBlank(secondarySalesAppVos.getNper()) && StringUtils.isNotBlank(secondarySalesAppVos.getCurrentPeriod())) { secondarySalesAppVos.setQsCount(secondarySalesAppVos.getNper() + "/" + secondarySalesAppVos.getCurrentPeriod()); From 788659e7bd0b859a92b0b9a9e774c8565315634e Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 30 May 2025 11:59:42 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 22 +++++++++---------- .../LoanBuckleApplyService.java | 10 ++++----- .../LoanCaseCloseApplyService.java | 2 +- .../LoanCaseExecuteApplyService.java | 3 +-- 4 files changed, 17 insertions(+), 20 deletions(-) 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 77a22f6f56..7f07c64421 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 @@ -2130,7 +2130,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService bdCustomers = new ArrayList<>(); BdCustomer bdCustomer = new BdCustomer(); bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo()); @@ -7477,7 +7477,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService bdCustomers = new ArrayList<>(); BdCustomer bdCustomer = new BdCustomer(); bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo()); @@ -7559,7 +7559,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService bdCustomers = new ArrayList<>(); BdCustomer bdCustomer = new BdCustomer(); bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo()); @@ -7659,7 +7659,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService bdCustomers = new ArrayList<>()666; BdCustomer bdCustomer = new BdCustomer(); bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo()); @@ -7731,7 +7731,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService bdCustomers = new ArrayList<>(); BdCustomer bdCustomer = new BdCustomer(); bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo()); @@ -7871,7 +7871,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService bdCustomers = new ArrayList<>(); BdCustomer bdCustomer = new BdCustomer(); bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo()); @@ -7977,7 +7977,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService bdCustomers = new ArrayList<>(); BdCustomer bdCustomer = new BdCustomer(); bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo()); @@ -8086,7 +8086,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService bdCustomers = new ArrayList<>(); BdCustomer bdCustomer = new BdCustomer(); bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo()); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java index a2672fa487..cc6965b9ec 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java @@ -747,8 +747,7 @@ public class LoanBuckleApplyService extends MybatisBaseService bdCustomers = new ArrayList<>(); + if (aBoolean != null && !aBoolean) { BdCustomer bdCustomer = new BdCustomer(); bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo()); bdCustomer.setFShortName(salesOrder.getContractNo()); @@ -878,7 +877,7 @@ public class LoanBuckleApplyService extends MybatisBaseService bdCustomers = new ArrayList<>(); BdCustomer bdCustomer = new BdCustomer(); bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo()); @@ -985,8 +984,7 @@ public class LoanBuckleApplyService extends MybatisBaseService bdCustomers = new ArrayList<>(); + if (aBoolean != null && !aBoolean) { BdCustomer bdCustomer = new BdCustomer(); bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo()); bdCustomer.setFShortName(salesOrder.getContractNo()); @@ -1034,7 +1032,7 @@ public class LoanBuckleApplyService extends MybatisBaseService resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer); if (resultBean.getSuccess()) { customerNumber = bdCustomer.getFNumber(); From c91410048a5cc18441fffd4073138d972853b599 Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 30 May 2025 14:26:31 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanReturnInboundApplyMapper.xml | 1 + .../LoanReturnInboundApplyService.java | 15 +++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.xml index eddbc8042e..ed572420cd 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.xml @@ -79,6 +79,7 @@ from loan_return_veh_ledger where useOrgSid = #{useOrgSid} and vehType = '主车' + and stockStateKey = '0001'