打印金融报价单优化

催收录入按照最近文档优化

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -1638,8 +1638,12 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             baseVehicleOut.setCreateBySid(baseVehicleOutApply.getCreateBySid());
             if ("001".equals(payTypeKey)) {//全款
                 baseVehicleOut.setCwCustomerNo(baseVehicleZSOutApplyDto.getContractNo());
+                baseVehicleOut.setTypeKey("001");
+                baseVehicleOut.setType("全款车");
             } else {//贷款
                 baseVehicleOut.setCwCustomerNo(bdCustomer.getFNumber());
+                baseVehicleOut.setTypeKey("002");
+                baseVehicleOut.setType("贷款车");
             }
             baseVehicleOut.setManPurOrderTypeKey(baseVehicle.getManPurOrderTypeKey());
             baseVehicleOut.setManPurOrderTypeValue(baseVehicle.getManPurOrderTypeValue());

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordVehInit.java

@@ -17,6 +17,10 @@ public class LoanBeCollectionRecordVehInit {
     private String custName;
     @ApiModelProperty("联系电话")
     private String custPhone;
+    @ApiModelProperty("客户及电话")
+    private String custNameAndPhone;
+    @ApiModelProperty("实际还款人及电话")
+    private String reaRepaymentNameAndPhone;
     @ApiModelProperty("贷款合同编号")
     private String loanContractNo;
     @ApiModelProperty("资方")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/DkRecordQuery.java

@@ -49,12 +49,16 @@ public class DkRecordQuery implements Query {
 
     @ApiModelProperty("分公司")
     private String useOrgName;
+    @ApiModelProperty("发起部门")
+    private String deptName;
     @ApiModelProperty("垫款申请编号")
     private String billNo;
     @ApiModelProperty("车架号")
     private String vinNo;
     @ApiModelProperty("贷款合同编号")
     private String loanContractNo;
+    @ApiModelProperty("资方合同编号")
+    private String bankContractNo;
     @ApiModelProperty("资方")
     private String bankName;
     @ApiModelProperty("客户名称")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/DkRecordVo.java

@@ -47,6 +47,10 @@ import lombok.Data;
 @Data
 public class DkRecordVo implements Vo {
 
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
     @ApiModelProperty("垫款申请编号")
     private String billNo;
 	@ApiModelProperty("车架号")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java

@@ -197,8 +197,10 @@ public class LoanBeCollectionRecordService extends MybatisBaseService<LoanBeColl
 		loanBeCollectionRecordInit.setSpouseMobile(loanHomevisitInvestigateCustomerDetailsVo.getSpouseMobile());
 		List<LoanBeCollectionRecordVehInit> loanBeCollectionRecordVehInits = loanBeOverdueVehService.initVehListByBorrSid(busSalesOrderVehicle.getBorrowerSid());
 		for (LoanBeCollectionRecordVehInit loanBeCollectionRecordVehInit : loanBeCollectionRecordVehInits) {
+			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());
 			//开票管理sid

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyMapper.xml

@@ -50,6 +50,8 @@
 
     <select id="dkListPage" resultType="com.yxt.anrui.riskcenter.api.loanbepadsincereapply.DkRecordVo">
         SELECT
+        la.useOrgName,
+        la.deptName,
         la.billNo,
         lv.vinNo,
         lv.`loanContractNo`,

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java

@@ -241,6 +241,9 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
         if (StringUtils.isNotBlank(query.getUseOrgName())) {
             qw.like("la.useOrgName", query.getUseOrgName());
         }
+        if (StringUtils.isNotBlank(query.getDeptName())) {
+            qw.like("la.deptName", query.getDeptName());
+        }
         if (StringUtils.isNotBlank(query.getBillNo())) {
             qw.like("la.billNo", query.getBillNo());
         }
@@ -250,6 +253,9 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
         if (StringUtils.isNotBlank(query.getLoanContractNo())) {
             qw.like("lv.loanContractNo", query.getLoanContractNo());
         }
+        if (StringUtils.isNotBlank(query.getBankContractNo())) {
+            qw.like("lv.bankContractNo", query.getBankContractNo());
+        }
         if (StringUtils.isNotBlank(query.getBankName())) {
             qw.like("lv.bankName", query.getBankName());
         }