diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoPageVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoPageVo.java index 570e67ffe1..9061f4a2b0 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoPageVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoPageVo.java @@ -74,6 +74,8 @@ public class PcSelBillVinNoPageVo implements Vo { private String invoiceType; @ApiModelProperty("开票类型key") private String invoiceTypeKey; + @ApiModelProperty("贷款人sid") + private String borrowerSid; @ApiModelProperty("开票名称sid") private String openTickSid; @ApiModelProperty("开票名称") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml index 360185a386..001c8cd160 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml @@ -113,7 +113,10 @@ bo.`purchaseSystemSid`, bm.`modelName`, bm.`modelSid`, - bo.`oneBillMoney` AS kpMoney + bo.`oneBillMoney` AS kpMoney, + bo.billingTypeKey AS invoiceTypeKey, + bo.billingType AS invoiceType, + bv.borrowerSid FROM anrui_buscenter.`bus_sales_order_vehicle` bv JOIN anrui_buscenter.`bus_sales_order` bo diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index c2e342d491..f4f4cb8c00 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -465,23 +465,23 @@ public class FinBillApplicationService extends MybatisBaseService selectInvoingByName(String affiliatedCompany) { + public ResultBean selectInvoingBySid(String affiliatedCompanySid) { ResultBean rb = ResultBean.fireFail(); - FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = baseMapper.selectInvoingByName(affiliatedCompany); + FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = baseMapper.selectInvoingBySid(affiliatedCompanySid); return rb.success().setData(finCompanyInvoicingDetailsVo); } } \ No newline at end of file diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml index 731aecb88e..dabb7578be 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml @@ -376,17 +376,17 @@ select DATE_FORMAT(createTime, '%Y-%m-%d') as date, - sum(saleOfStockRatio) as saleOfStockRatio, - sum(stock_subtotal) as stock_subtotal, - sum(pcOrder_subtotal) as pcOrder_subtotal, - sum(saleOrder_subtotal_day) as saleOrder_subtotal_day, - sum(sale_subtotal_day) as sale_subtotal_day, - sum(arrears_carry_veh_amount) as arrears_carry_veh_amount, - sum(loan_not_amount) as loan_not_amount, - sum(loan_not_amounts) as loan_not_amounts, - sum(buyout_day) as buyout_day, - sum(saleAllToThree) as saleAllToThree, - SUM(stock_total) as stock_total, + sum(saleOfStockRatio) as saleOfStockRatio, + sum(stock_subtotal) as stock_subtotal, + sum(pcOrder_subtotal) as pcOrder_subtotal, + sum(saleOrder_subtotal_day) as saleOrder_subtotal_day, + sum(sale_subtotal_day) as sale_subtotal_day, + sum(arrears_carry_veh_amount) as arrears_carry_veh_amount, + sum(loan_not_amount) as loan_not_amount, + ifnull(sum(loan_not_amounts), 0) as loan_not_amounts, + sum(buyout_day) as buyout_day, + sum(saleAllToThree) as saleAllToThree, + SUM(stock_total) as stock_total, useOrgSid from daily_report @@ -405,7 +405,7 @@ sum(sale_subtotal_day) as sale_subtotal_day, sum(arrears_carry_veh_amount) as arrears_carry_veh_amount, sum(loan_not_amount) as loan_not_amount, - sum(loan_not_amounts) as loan_not_amounts, + ifnull(sum(loan_not_amounts), 0) as loan_not_amounts, sum(buyout_day) as buyout_day, sum(saleAllToThree) as saleAllToThree, SUM(stock_total) as stock_total, diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java index 8c11a93a4c..6becf4b50f 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java @@ -30,11 +30,16 @@ import cn.hutool.core.date.DateUtil; 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.buscenter.api.bussalesorder.BusSalesOrder; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; +import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo; +import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDto; +import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; @@ -120,8 +125,12 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService 0) { for (String yhk : bankCardImages) { diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java index 1d3f6e7842..2d25c11599 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java @@ -450,20 +450,20 @@ public class LoanHomevisitPrepService extends MybatisBaseService filesList = new ArrayList<>(); - /*//贷款车辆买卖合同 + //贷款车辆买卖合同 List dkclmmhts = dkclmmht(printConfirmDto, conSetUpKey); //生成车辆融资协议 List clrzxyUrls = generateCLRZXY(printConfirmDto, conSetUpKey); //生成还款协议 List hkxyUrls = hkxy(printConfirmDto, conSetUpKey); //代管车辆委托书 - List dgclwtsUrls = dgclwts(printConfirmDto, conSetUpKey);*/ + List dgclwtsUrls = dgclwts(printConfirmDto, conSetUpKey); //判断是否为高低开 BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNoOne(printConfirmDto.getContractNo()).getData(); //查询金融方案 SolutionsDetailsVo solutionsDetailsVo = loanSolutionsService.selectDetails(busSalesOrder.getSid()).getData(); //判断是否为高低开，若是则生成开票申请书 - /*List kpsqsUrls = new ArrayList<>(); + List kpsqsUrls = new ArrayList<>(); if (!data.getSingleFinalPrice().equals(solutionsDetailsVo.getMainVehicleAmount())) { //开票申请书 kpsqsUrls = kpsqs(printConfirmDto, conSetUpKey); @@ -477,11 +477,11 @@ public class LoanHomevisitPrepService extends MybatisBaseService jsclqrsUrls = jsclqrs(printConfirmDto, conSetUpKey); //接收车辆委托书 - List jsclwtsUrls = jsclwts(printConfirmDto, conSetUpKey);*/ + List jsclwtsUrls = jsclwts(printConfirmDto, conSetUpKey); //销售订单上装信息 List busSalesOrderMakeupDetailsVoList = busSalesOrderMakeupFeign.selectTopByOrderSid(busSalesOrder.getSid()).getData(); //查询金融方案中挂车信息 - /* List cljszcghtUrls = new ArrayList<>(); + List cljszcghtUrls = new ArrayList<>(); if ((busSalesOrderMakeupDetailsVoList != null && busSalesOrderMakeupDetailsVoList.size() > 0) || solutionsDetailsVo.isTrailerAmountCb()){ //生成车辆及上装采购合同 cljszcghtUrls = cljszcght(printConfirmDto, conSetUpKey); @@ -490,8 +490,8 @@ public class LoanHomevisitPrepService extends MybatisBaseService 0) { + } + if (dkclmmhts != null && dkclmmhts.size() > 0) { for (String dkclmmht : dkclmmhts) { File file = new File(docPdfComponent.getUploadTemplateUrl() + dkclmmht); filesList.add(file); @@ -550,7 +550,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService 0) { String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); 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 c63a0675aa..a6ff9e5e20 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 @@ -61,4 +61,6 @@ public interface LoanRepaymentHistoryMapper extends BaseMapper stringList, @Param("formatDate") String formatDate); List selNotRuleForBuckSids(@Param("useOrgSid") String useOrgSid); + + String selPayStateByPlanSid(@Param("key") String key); } 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 97e396795b..90cccbb695 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 @@ -11,6 +11,7 @@ + + \ No newline at end of file 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 1d468dcb98..8bdbc18218 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 @@ -905,11 +905,11 @@ public class LoanRepaymentHistoryService extends MybatisBaseService(); } - qw.eq("p.orgSidPath", useOrgSid); + qw.eq("p.useOrgSid", useOrgSid); qw.ne("h.buckleKey", "002"); qw.ne("h.buckleKey", "003"); qw.eq("h.updateState", "1"); - qw.notIn("h.sid",selNotRuleForBuckSids); + qw.notIn("h.sid", selNotRuleForBuckSids); List histories = baseMapper.selbuckleNewInitList(qw); Map countMoney = new HashMap<>(); Map> sids = new HashMap<>(); @@ -920,8 +920,8 @@ public class LoanRepaymentHistoryService extends MybatisBaseService { RepaymentHistoryVoForBuckleNew r = new RepaymentHistoryVoForBuckleNew(); - if (StringUtils.isNotBlank(h.getPlanDetailSid()) && StringUtils.isNotBlank(h.getPayState())) { - r.setRule(h.getPlanDetailSid() + "!" + h.getPayState()); + if (StringUtils.isNotBlank(h.getPlanDetailSid())) { + r.setRule(h.getPlanDetailSid()); } if (StringUtils.isNotBlank(h.getSid())) { r.setSid(h.getSid()); @@ -931,6 +931,19 @@ public class LoanRepaymentHistoryService extends MybatisBaseService { +// RepaymentHistoryVoForBuckleNew r = new RepaymentHistoryVoForBuckleNew(); +// if (StringUtils.isNotBlank(h.getPlanDetailSid()) && StringUtils.isNotBlank(h.getPayState())) { +// r.setRule(h.getPlanDetailSid() + "!" + h.getPayState()); +// } +// if (StringUtils.isNotBlank(h.getSid())) { +// r.setSid(h.getSid()); +// } +// if (null != h.getActualMoney()) { +// r.setActualMoney(h.getActualMoney()); +// } +// newList.add(r); +// }); if (!newList.isEmpty()) { countMoney = newList.stream() .collect(Collectors.groupingBy(RepaymentHistoryVoForBuckleNew::getRule, CollectorsUtil.summingBigDecimal(RepaymentHistoryVoForBuckleNew::getActualMoney))); @@ -952,18 +965,21 @@ public class LoanRepaymentHistoryService extends MybatisBaseService> entry : stringListMap.entrySet()) { LoanBuckleHistoryRecord record = new LoanBuckleHistoryRecord(); - String planSid = ""; - String payState = ""; - if (StringUtils.isNotBlank(entry.getKey())) { - String[] split = entry.getKey().split("!"); - planSid = split[0]; - payState = split[1]; +// String planSid = ""; +// String payState = ""; +// if (StringUtils.isNotBlank(entry.getKey())) { +// String[] split = entry.getKey().split("!"); +// planSid = split[0]; +// payState = split[1]; +// } + record.setRecordSid(entry.getKey()); + String payState = baseMapper.selPayStateByPlanSid(entry.getKey()); + if (StringUtils.isNotBlank(payState)) { + record.setPayState(payState); } - record.setRecordSid(planSid); - record.setPayState(payState); record.setHistorySids(entry.getValue()); record.setActualMoney(newMap.get(entry.getKey()).toString()); - LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchBySid(planSid); + LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchBySid(entry.getKey()); if (null != planDetails) { if (StringUtils.isNotBlank(planDetails.getLoanContractNo())) { record.setLoanContractNo(planDetails.getLoanContractNo()); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index ad74724399..e992497e56 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -282,12 +282,12 @@ public class ScmApplyInboundService extends MybatisBaseService 0) { + /* if (count > 0) { baseMapper.updateNodeStatedtj(dto.getSid()); return new ResultBean().setMsg("入库车辆信息中" + vinNoList.get(i) + "车架号已经存在"); - } + }*/ if (data != null) { if (StringUtils.isNotBlank(data.getVinNo())) { baseMapper.updateNodeStatedtj(dto.getSid());