From fc4975e1a40e826098391ad15527bf63003f29af Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 29 Dec 2023 17:47:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanBeCollectionApplyQuery.java | 4 +++ .../LoanBeCollectionApplyVo.java | 2 ++ .../LoanBeCollectionRecordVehInit.java | 16 +++------ .../api/loanbepadsincereapply/DkRecordVo.java | 2 +- .../LoanBePadsincereApplyQuery.java | 4 +++ .../LoanBePadsincereApplyVo.java | 2 ++ .../LoanBeCollectionApplyMapper.xml | 2 +- .../LoanBeCollectionApplyService.java | 13 +++++++ .../LoanBeCollectionRecordMapper.xml | 2 +- .../LoanBeCollectionRecordService.java | 36 +++++++++++++++---- .../LoanBeOverdueVehMapper.xml | 4 +-- .../LoanBePadsincereApplyMapper.xml | 8 +++-- .../LoanBePadsincereApplyService.java | 18 +++++++++- .../LoanRepaymentPlanDetailsMapper.xml | 1 + 14 files changed, 88 insertions(+), 26 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyQuery.java index 30a4acaa74..90630031a2 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyQuery.java @@ -59,6 +59,10 @@ public class LoanBeCollectionApplyQuery implements Query { private String createStartTime; @ApiModelProperty("申请结束日期") private String createEndTime; + @ApiModelProperty("办结开始日期") + private String modifyStartTime; + @ApiModelProperty("办结结束日期") + private String modifyEndTime; @ApiModelProperty("催收措施") private String collMeasure; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyVo.java index 91c9960820..a6a4f0de83 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyVo.java @@ -65,6 +65,8 @@ public class LoanBeCollectionApplyVo implements Vo { @ApiModelProperty("申请日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date createTime; + @ApiModelProperty("办结日期") + private String modifyTime; @ApiModelProperty("催收措施") private String collMeasure; @ApiModelProperty("备注") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordVehInit.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordVehInit.java index 36c07ae563..bda8056d8b 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordVehInit.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordVehInit.java @@ -1,10 +1,12 @@ package com.yxt.anrui.riskcenter.api.loanbecollectionrecord; import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFile; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; +import java.util.List; @Data public class LoanBeCollectionRecordVehInit { @@ -34,19 +36,11 @@ public class LoanBeCollectionRecordVehInit { private String beOverdueMoney; @ApiModelProperty("逾期金额换算期数") private String beOverdueMoneyAndPeriod; - @ApiModelProperty("销售订单sid") private String salesOrderSid; @ApiModelProperty("销售订单车辆sid") private String saleVehSid; - @ApiModelProperty("开票管理sid") - private String kpglSid; - @ApiModelProperty("月还明细sid") - private String yhmxSid; - @ApiModelProperty("金融方案sid") - private String jrfaSid; - @ApiModelProperty("家访考察报告sid") - private String kcbgSid; - @ApiModelProperty("家访考察资料sid") - private String kczlSid; + + @ApiModelProperty + private List sids; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/DkRecordVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/DkRecordVo.java index dc8541fd1a..bdf06c3811 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/DkRecordVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/DkRecordVo.java @@ -49,7 +49,7 @@ public class DkRecordVo implements Vo { @ApiModelProperty("分公司名称") private String useOrgName; - @ApiModelProperty("申请部门名称") + @ApiModelProperty("销售部门名称") private String deptName; @ApiModelProperty("垫款申请编号") private String billNo; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyQuery.java index de5dcbc15e..d725e57e36 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyQuery.java @@ -62,6 +62,10 @@ public class LoanBePadsincereApplyQuery implements Query { private String createStartTime; @ApiModelProperty("申请结束日期") private String createEndTime; + @ApiModelProperty("办结开始日期") + private String modifyStartTime; + @ApiModelProperty("办结结束日期") + private String modifyEndTime; private String userSid; private String orgPath; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyVo.java index ac495bb725..d75cb2e5a0 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyVo.java @@ -64,6 +64,8 @@ public class LoanBePadsincereApplyVo implements Vo { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("申请日期") private Date createTime; + @ApiModelProperty("办结日期") + private String modifyTime; @ApiModelProperty("申请编号") private String billNo; @ApiModelProperty("备注") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyMapper.xml index d06a1c63ac..705cb06343 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyMapper.xml @@ -21,7 +21,7 @@ UPDATE loan_be_collection_apply - SET nodeState=#{nodeState}, nodeSid=#{taskDefKey} + SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}, modifyTime = NOW() , procDefId=#{procDefId} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java index 00c6f01476..47d291d582 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java @@ -26,6 +26,7 @@ package com.yxt.anrui.riskcenter.biz.loanbecollectionapply; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -59,6 +60,7 @@ import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecor import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDetailsVo; import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDto; import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFile; +import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.LoanBePadsincereApplyVo; import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; @@ -195,12 +197,23 @@ public class LoanBeCollectionApplyService extends MybatisBaseService= date_format('" + query.getCreateStartTime() + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(query.getCreateEndTime()), "date_format (createTime,'%Y-%m-%d') <= date_format('" + query.getCreateEndTime() + "','%Y-%m-%d')" ); + qw.apply(StringUtils.isNotBlank(query.getModifyStartTime()), "date_format (modifyTime,'%Y-%m-%d') >= date_format('" + query.getModifyStartTime() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(query.getModifyEndTime()), "date_format (modifyTime,'%Y-%m-%d') <= date_format('" + query.getModifyEndTime() + "','%Y-%m-%d')" + ); if (StringUtils.isNotBlank(query.getCollMeasure())) { qw.like("collMeasure", query.getCollMeasure()); } qw.orderByDesc("createTime"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + for (LoanBeCollectionApplyVo record : pagging.getRecords()) { + if ("终止".equals(record.getNodeState()) || "已办结".equals(record.getNodeState())) { + DateTime modifyTime = DateUtil.parse(record.getModifyTime()); + record.setModifyTime(DateUtil.formatDate(modifyTime)); + } else { + record.setModifyTime("未办结"); + } + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordMapper.xml index bc74f286c7..ce22035bea 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordMapper.xml @@ -43,7 +43,7 @@ a1.dueDate AS firstBeDate, COUNT(a1.sid) AS beOverduePeriod, SUM(a1.yq_total) AS beOverdueMoney, - SUM(a1.yq_hsqs) AS beOverdueMoneyAndPeriod + ROUND(SUM(a1.yq_hsqs), 1) AS beOverdueMoneyAndPeriod FROM (SELECT lrpd.sid, diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java index ca06f9d799..8344190612 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java @@ -38,6 +38,8 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.*; +import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDetailsVo; +import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomer; @@ -197,25 +199,45 @@ public class LoanBeCollectionRecordService extends MybatisBaseService loanBeCollectionRecordVehInits = loanBeOverdueVehService.initVehListByBorrSid(busSalesOrderVehicle.getBorrowerSid()); for (LoanBeCollectionRecordVehInit loanBeCollectionRecordVehInit : loanBeCollectionRecordVehInits) { + List loanBeCollectionVehFiles = new ArrayList<>(); loanBeCollectionRecordVehInit.setCustNameAndPhone(loanBeCollectionRecordVehInit.getCustName() + loanBeCollectionRecordVehInit.getCustPhone()); BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanBeCollectionRecordVehInit.getSalesOrderSid()).getData(); BusSalesOrderVehicle busSalesOrderVehicle1 = busSalesOrderVehicleFeign.details(loanBeCollectionRecordVehInit.getSaleVehSid()).getData(); loanBeCollectionRecordVehInit.setReaRepaymentNameAndPhone(busSalesOrderVehicle1.getReaRepaymentName() + busSalesOrderVehicle1.getReaRepaymentPhone()); //催收记录sid - loanBeCollectionRecordVehInit.setSaleVehSid(loanBeCollectionRecordVehInit.getSaleVehSid()); + LoanBeCollectionVehFile loanBeCollectionVehFile1 = new LoanBeCollectionVehFile(); + loanBeCollectionVehFile1.setName("催收记录"); + loanBeCollectionVehFile1.setSid(loanBeCollectionRecordVehInit.getSaleVehSid()); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile1); //开票管理sid FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(busSalesOrderVehicle1.getLinkSid(), busSalesOrder.getContractNo()).getData(); - //loanBeCollectionRecordVehInit.setKpglSid(finVehicleInvoice.getSid()); + LoanBeCollectionVehFile loanBeCollectionVehFile2 = new LoanBeCollectionVehFile(); + loanBeCollectionVehFile2.setName("开票信息"); + loanBeCollectionVehFile2.setSid(finVehicleInvoice.getSid()); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile2); //月还明细sid - loanBeCollectionRecordVehInit.setYhmxSid(saleVehSid); + LoanBeCollectionVehFile loanBeCollectionVehFile3 = new LoanBeCollectionVehFile(); + loanBeCollectionVehFile3.setName("月还明细"); + loanBeCollectionVehFile3.setSid(saleVehSid); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile3); //金融方案sid - LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(loanBeCollectionRecordVehInit.getSalesOrderSid()); - loanBeCollectionRecordVehInit.setJrfaSid(loanSolutions.getSid()); + LoanBeCollectionVehFile loanBeCollectionVehFile4 = new LoanBeCollectionVehFile(); + loanBeCollectionVehFile4.setName("金融方案"); + loanBeCollectionVehFile4.setSid(loanBeCollectionRecordVehInit.getSalesOrderSid()); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile4); //家访考察报告sid String sid = loanHomevisitInvestigateService.selectByBorrSid(busSalesOrderVehicle.getBorrowerSid()); - loanBeCollectionRecordVehInit.setKcbgSid(sid); + LoanBeCollectionVehFile loanBeCollectionVehFile5 = new LoanBeCollectionVehFile(); + loanBeCollectionVehFile5.setName("家访考察报告"); + loanBeCollectionVehFile5.setSid(sid); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile5); //家访考察资料sid - loanBeCollectionRecordVehInit.setKczlSid(sid); + LoanBeCollectionVehFile loanBeCollectionVehFile6 = new LoanBeCollectionVehFile(); + loanBeCollectionVehFile6.setName("家访考察资料"); + loanBeCollectionVehFile6.setSid(sid); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile6); + loanBeCollectionRecordVehInit.setSids(loanBeCollectionVehFiles); + loanBeCollectionRecordVehInits.add(loanBeCollectionRecordVehInit); } loanBeCollectionRecordInit.setLoanBeCollectionRecordVehInitList(loanBeCollectionRecordVehInits); return loanBeCollectionRecordInit; diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml index 6d02cb52f4..3e006d7854 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml @@ -18,7 +18,7 @@ a1.dueDate AS firstBeDate, COUNT(a1.sid) AS beOverduePeriod, SUM(a1.yq_total) AS beOverdueMoney, - SUM(a1.yq_hsqs) AS beOverdueMoneyAndPeriod, + ROUND(SUM(a1.yq_hsqs), 1) AS beOverdueMoneyAndPeriod, SUM(a1.yd_dkje) AS advMoney, SUM(a1.yd_zjzyf) AS fundPossCostMoney, a1.riskStaffUserSid, @@ -87,7 +87,7 @@ a1.dueDate AS firstBeDate, COUNT(a1.sid) AS beOverduePeriod, SUM(a1.yq_total) AS beOverdueMoney, - SUM(a1.yq_hsqs) AS beOverdueMoneyAndPeriod, + ROUND(SUM(a1.yq_hsqs), 1) AS beOverdueMoneyAndPeriod, a1.busVinSid AS saleVehSid, a1.salesOrderSid FROM diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyMapper.xml index 629a08150d..2cd792d862 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyMapper.xml @@ -20,7 +20,7 @@ UPDATE loan_be_padsincere_apply - SET nodeState=#{nodeState}, nodeSid=#{taskDefKey} + SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}, modifyTime = NOW() , procDefId=#{procDefId} @@ -51,7 +51,7 @@