From 98925e7eb89b4032ba4293a0a5526a12921a0e54 Mon Sep 17 00:00:00 2001 From: ligaode Date: Wed, 30 Apr 2025 16:59:03 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../loanoverduefin/LoanOverdueFinService.java | 1 - .../biz/scmvehrebate/ScmVehRebateMapper.xml | 36 ++++++++++++++++++- .../biz/scmvehrebate/ScmVehRebateService.java | 21 ----------- 3 files changed, 35 insertions(+), 23 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java index 9e35d5f999..a9d6e83946 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java @@ -772,7 +772,6 @@ public class LoanOverdueFinService extends MybatisBaseService SELECT - *, + purchaseSystemName, + vinNo, + vehModelName, + palceGenDate, + rebateTypeValue, + rebateName, + estimateRebate, + uploadMoney, + secondaryUploadMoney, + stayDetermineMoney, + adjustmentMoney, + date_format(createTime, '%Y-%m-%d') as createTime, + withholdingDate, + uploadDate, + secondaryUploadDate, + case state + WHEN '0' THEN '未预提' + WHEN '1' THEN '预提中' + WHEN '2' THEN '待核对' + WHEN '3' THEN '核对中' + WHEN '4' THEN '已核对' + end as state, + case onceCheckState + WHEN '0' THEN '否' + WHEN '1' THEN '是' + WHEN '2' THEN '一次核对中' + end as onceCheckState, + manufactorSettlementPrice, + freight, + topAmount, + calculationModeValue, + calculationStandard, + remarks, + brandName, + createOrgName, expectTreatCost + expectSuppCost AS withholdCost, onceTreatCost + onceSuppCost + secondTreatCost + secondSuppCost AS money, estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0) AS notUploadMoney, diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java index 54f31de90d..e13b919fb3 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java @@ -2536,27 +2536,6 @@ public class ScmVehRebateService extends MybatisBaseService scmVehRebateExcelVos = baseMapper.excelList(qw); - for (ScmVehRebateExcelVo scmVehRebateExcelVo : scmVehRebateExcelVos) { - if (scmVehRebateExcelVo.getState().equals("0")) { - scmVehRebateExcelVo.setState("未预提"); - } else if (scmVehRebateExcelVo.getState().equals("1")) { - scmVehRebateExcelVo.setState("预提中"); - } else if (scmVehRebateExcelVo.getState().equals("2")) { - scmVehRebateExcelVo.setState("待核对"); - } else if (scmVehRebateExcelVo.getState().equals("3")) { - scmVehRebateExcelVo.setState("核对中"); - } else if (scmVehRebateExcelVo.getState().equals("4")) { - scmVehRebateExcelVo.setState("已核对"); - } - if (scmVehRebateExcelVo.getOnceCheckState().equals("0")) { - scmVehRebateExcelVo.setOnceCheckState("否"); - } else if (scmVehRebateExcelVo.getOnceCheckState().equals("1")) { - scmVehRebateExcelVo.setOnceCheckState("是"); - } else if (scmVehRebateExcelVo.getOnceCheckState().equals("2")) { - scmVehRebateExcelVo.setOnceCheckState("一次核对中"); - } - scmVehRebateExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parse(scmVehRebateExcelVo.getCreateTime()))); - } return scmVehRebateExcelVos; } } \ No newline at end of file From 8e67f6ed14fe813065340d1df59f28dff685de39 Mon Sep 17 00:00:00 2001 From: ligaode Date: Tue, 6 May 2025 10:15:28 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanRedemptionApplyService.java | 54 +++++++++++-------- .../LoanRepaymentPlanDetailsMapper.java | 2 + .../LoanRepaymentPlanDetailsMapper.xml | 10 ++++ .../LoanRepaymentPlanDetailsService.java | 4 ++ 4 files changed, 47 insertions(+), 23 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java index c4278a58c4..956e531d61 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java @@ -7,16 +7,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; -import com.yxt.anrui.base.common.enums.BillTypeEnum; -import com.yxt.anrui.base.common.utils.Rule; -import com.yxt.anrui.base.common.utils.domain.BillNo; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRFeign; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; -import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; @@ -33,11 +33,6 @@ 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.loanbuckleapply.*; -import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppBuckleDetailsVo; -import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppRecordVo; -import com.yxt.anrui.riskcenter.api.loanbuckleapply.flow.*; -import com.yxt.anrui.riskcenter.api.loanbuckleapplyrecord.LoanBuckleApplyRecord; import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.api.loanoutboundapply.LoanOutboundApplyDto; @@ -47,12 +42,8 @@ import com.yxt.anrui.riskcenter.api.loanredemptionapply.app.AppRedemptionDetails import com.yxt.anrui.riskcenter.api.loanredemptionapply.app.AppVinListVo; import com.yxt.anrui.riskcenter.api.loanredemptionapply.flow.*; import com.yxt.anrui.riskcenter.api.loanredemptionveh.LoanRedemptionVeh; -import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory; -import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryRecordVo; -import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo; import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger; -import com.yxt.anrui.riskcenter.api.loansubletapply.SubletVinList; import com.yxt.anrui.riskcenter.api.loansubletapply.VehDisposal; import com.yxt.anrui.riskcenter.biz.loanbuckleapplyrecord.LoanBuckleApplyRecordService; import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; @@ -93,14 +84,10 @@ public class LoanRedemptionApplyService extends MybatisBaseService listPage(PagerQuery pq) { IPage page = PagerUtil.queryToPage(pq); @@ -804,6 +787,31 @@ public class LoanRedemptionApplyService extends MybatisBaseService redemptionVinLists = loanRedemptionVehService.selByMainSid(businessSid); + FinUncollectedReceivablesDetailedJR finUncollectedReceivablesDetailedJR = new FinUncollectedReceivablesDetailedJR(); + finUncollectedReceivablesDetailedJR.setCreateByName(redemptionApply.getApplyName()); + finUncollectedReceivablesDetailedJR.setCreateBySid(redemptionApply.getCreateBySid()); + //查询销售订单信息 + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.fetchBySalesOrderVehiclerSid(redemptionVinLists.get(0).getBusVinSid()).getData(); + BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData(); + finUncollectedReceivablesDetailedJR.setApplySid(redemptionApply.getSid()); + String planSid = loanRepaymentPlanDetailsService.selByBusVinSidMax(busSalesOrderVehicle.getSid()); + finUncollectedReceivablesDetailedJR.setBusSid(planSid); + finUncollectedReceivablesDetailedJR.setPayCostTitleKey("016"); + finUncollectedReceivablesDetailedJR.setPayCostTitleValue("收回车辆费用"); + finUncollectedReceivablesDetailedJR.setReveivableMoney(redemptionApply.getFees()); + finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(redemptionApply.getFees()); + finUncollectedReceivablesDetailedJR.setPurchaseSystemSid(busSalesOrder.getPurchaseSystemSid()); + finUncollectedReceivablesDetailedJR.setPurchaseSystemName(busSalesOrder.getPurchaseSystemName()); + finUncollectedReceivablesDetailedJR.setStaffUserSid(busSalesOrder.getCreateBySid()); + finUncollectedReceivablesDetailedJR.setStaffName(busSalesOrder.getStaffName()); + finUncollectedReceivablesDetailedJR.setStaffDeptSid(busSalesOrder.getOrgSid()); + finUncollectedReceivablesDetailedJR.setStaffDeptName(busSalesOrder.getOrgName()); + finUncollectedReceivablesDetailedJR.setUseOrgSid(redemptionApply.getUseOrgSid()); + finUncollectedReceivablesDetailedJR.setUseOrgName(redemptionApply.getUseOrgName()); + finUncollectedReceivablesDetailedJR.setOrgSidPath(redemptionApply.getOrgSidPath()); + finUncollectedReceivablesDetailedJR.setKxState("01"); + finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR); try { ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() .setNameFormat("demo-pool-%d").build(); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java index 974bcaed98..158d866bbf 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java @@ -113,4 +113,6 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper + + diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java index ed250fd3b1..eeab374d28 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java @@ -391,4 +391,8 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService Date: Tue, 6 May 2025 11:03:55 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSecondarySalesApplyService.java | 82 +++++++++++++++++++ 1 file changed, 82 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 416ab83126..aa60ad29a5 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 @@ -9,6 +9,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; @@ -51,6 +56,7 @@ import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail; import com.yxt.anrui.riskcenter.api.loansubletapply.LoanSubletApply; import com.yxt.anrui.riskcenter.api.loansubletapply.SubletVinList; import com.yxt.anrui.riskcenter.biz.loanoutboundapply.LoanOutboundApplyService; +import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService; import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService; import com.yxt.anrui.riskcenter.biz.loanreturninboundapply.LoanReturnInboundApplyService; import com.yxt.anrui.riskcenter.biz.loanreturnvehledger.LoanReturnVehLedgerService; @@ -127,6 +133,14 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { LoanSecondarySalesApplyQuery query = pq.getParams(); @@ -545,6 +559,74 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService Date: Tue, 6 May 2025 11:47:39 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmSpecialrebateCheckapplyMapper.xml | 10 +- ...ScmSpecialrebateCheckapplydetailMapper.xml | 104 +++++++++--------- .../ScmVehrebateCheckapplydetailMapper.xml | 22 ++-- 3 files changed, 68 insertions(+), 68 deletions(-) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml index 41e1bf5ded..ea5d724fef 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml @@ -6,16 +6,16 @@ - SELECT GROUP_CONCAT(ssc.specialRebateSid) sid, - CONCAT(ssc.purchaseSystemName, ssc.brandName, ssc.rebateTypeValue, '明细') title, + SELECT GROUP_CONCAT(ssc.specialRebateSid) sid, + CONCAT(ssc.purchaseSystemName, ssc.brandName, ssc.rebateTypeValue, '明细') title, ssc.rebateTypeValue, - COUNT(*) num, - SUM(ssc.estimateRebate) withRebate, - SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost, - SUM(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney, - ssc.uploadMoney + ssc.secondaryUploadMoney)) uploadMoney, + COUNT(*) num, + SUM(ssc.estimateRebate) withRebate, + SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost, + SUM(CAST(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney, + ssc.uploadMoney + ssc.secondaryUploadMoney) AS DECIMAL(10, 2))) uploadMoney, SUM(IF(ssc.onceCheckState = 1, ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost, ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + - ssc.secondTreatCost + ssc.secondSuppCost)) AS money, - SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney)) stayDetermineMoney, - SUM(CAST(ssc.adjustmentMoney AS DECIMAL(10, 2))) adjustmentMoney, + ssc.secondTreatCost + ssc.secondSuppCost)) AS money, + SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney)) stayDetermineMoney, + SUM(CAST(ssc.adjustmentMoney AS DECIMAL(10, 2))) adjustmentMoney, SUM(IF(ssc.isAdjustment = '是', ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost - ssc.expectItureCost - ssc.expectTreatCost - - ssc.expectSuppCost, 0)) AS fyAdjustmentMoney + ssc.expectSuppCost, 0)) AS fyAdjustmentMoney FROM scm_specialrebate_checkapplydetail ssc WHERE ssc.mainSid = #{sid} AND ssc.purchaseSystemName = #{purchaseSystemName} @@ -122,23 +122,23 @@