diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrower.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrower.java index 12da876f2c..01200a8813 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrower.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrower.java @@ -31,46 +31,33 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: anrui-buscenter(销售订单)
- * File: BusSalesOrderBorrower.java
- * Class: com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower
- * Description: 销售订单-贷款人.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-08-10 13:46:47
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "销售订单-贷款人", description = "销售订单-贷款人") @TableName("bus_sales_order_borrower") public class BusSalesOrderBorrower extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("销售订单sid") + @ApiModelProperty("销售订单sid") private String salesOrderSid; - @ApiModelProperty("客户sid") + @ApiModelProperty("客户sid") private String customSid; - @ApiModelProperty("借款人名称") + @ApiModelProperty("借款人名称") private String borrowerName; - @ApiModelProperty("手机号码") + @ApiModelProperty("手机号码") private String mobile; - @ApiModelProperty("台数") + @ApiModelProperty("台数") private Integer vehCount; @ApiModelProperty("资方sid") private String bankSid; @ApiModelProperty("资方名称") private String bankName; - @ApiModelProperty("金融产品名称") + @ApiModelProperty("金融产品名称") private String policyName; - @ApiModelProperty("业务阶段编码") + @ApiModelProperty("业务阶段编码") private String busNo; - @ApiModelProperty("业务阶段名称") + @ApiModelProperty("业务阶段名称") private String busName; - @ApiModelProperty("业务状态码") + @ApiModelProperty("业务状态码") private String busState; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/xstc.ftl b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/xstc.ftl index 8e05e448ec..5098d8f363 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/xstc.ftl +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/xstc.ftl @@ -30,15 +30,16 @@ 10745413@qq.com 10745413@qq.com 2 - 0 - 2025-04-16T08:07:00Z - 2025-04-16T08:07:00Z + 1 + 2025-04-21T02:20:00Z + 2025-04-21T02:20:00Z + 2025-04-21T02:20:00Z 1 121 378 54 - 55 - 444 + 62 + 437 16 @@ -1168,7 +1169,7 @@ - + @@ -1181,7 +1182,7 @@ - + @@ -1196,7 +1197,7 @@ - + @@ -1209,7 +1210,7 @@ - + @@ -1240,20 +1241,30 @@ + + + + + + + + + + @@ -1262,17 +1273,17 @@ + + - - @@ -1283,6 +1294,7 @@ + @@ -1305,9 +1317,10 @@ - + + @@ -1354,9 +1367,10 @@ - + + @@ -1629,9 +1643,10 @@ - + + @@ -1806,7 +1821,7 @@ - ${finshTime!} + ${finishTime!} @@ -1915,9 +1930,10 @@ - + + @@ -2087,9 +2103,10 @@ - + + @@ -2259,9 +2276,10 @@ - + + @@ -2431,9 +2449,10 @@ - + + @@ -2519,9 +2538,10 @@ - + + @@ -2607,9 +2627,10 @@ - + + @@ -2695,9 +2716,10 @@ - + + @@ -2741,9 +2763,10 @@ - + + @@ -3041,9 +3064,10 @@ <#list wlList as wl> - + + @@ -3339,9 +3363,10 @@ - + + @@ -3506,9 +3531,10 @@ <#list lcList as lc> <#if (lc_index>0)> - + + @@ -3548,7 +3574,8 @@ - + @@ -3618,11 +3645,13 @@ - + - + @@ -3660,9 +3689,10 @@ - + + @@ -3690,6 +3720,7 @@ + @@ -3817,6 +3848,7 @@ + @@ -3827,66 +3859,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index ff69e01a78..0237fda948 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -71,7 +71,7 @@ public enum ProcDefEnum { LOANVEHCLEARANCEAPPLY("车辆远程解控申请", "process_zbzenr9b:2:7782504"), LOANRESTOREREPORTAPPLY("车辆交回事前报备申请", "process_w796wtt7:1:7822504"), LOANREDEMPTIONAPPLY("车辆交回赎回申请", "process_qu4fq4r6:1:7820004"), - LOANRETUENINBOUNDAPPLY("交回车辆入库申请", "process_h0i1vnn8:1:7945004"), + LOANRETUENINBOUNDAPPLY("交回车辆入库申请", "process_h0i1vnn8:2:19482504"), LOANSUBLETAPPLY("交回车辆二次转租申请", "process_lu7pdwzs:1:7940004"), LOANOUTBOUNDVEHAPPLY("交回车辆出库申请", "process_14spbdx8:1:7982504"), LOANSECONDSALEAPPLY("交车车辆二次销售申请", "process_6kb1z0pe:4:8110004"), diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/FlowableUuidConfig.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/FlowableUuidConfig.java new file mode 100644 index 0000000000..7d2069f06a --- /dev/null +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/FlowableUuidConfig.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.flowable.config; + +import org.flowable.common.engine.impl.persistence.StrongUuidGenerator; +import org.flowable.spring.SpringProcessEngineConfiguration; +import org.flowable.spring.boot.EngineConfigurationConfigurer; +import org.flowable.spring.boot.ProcessEngineConfigurationConfigurer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/4/21 + **/ +@Configuration +public class FlowableUuidConfig { + + @Bean + public EngineConfigurationConfigurer idGeneratorConfigurer() { + return configuration -> configuration.setIdGenerator(new StrongUuidGenerator()); + } +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVeh.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVeh.java index 916ff422d3..d47a8d3bc8 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVeh.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVeh.java @@ -31,56 +31,43 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: anrui-riskcenter(催收措施申请)
- * File: LoanBeCollectionVeh.java
- * Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVeh
- * Description: 逾期催收车辆.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-12-12 16:06:20
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "逾期催收车辆", description = "逾期催收车辆") @TableName("loan_be_collection_veh") public class LoanBeCollectionVeh extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String vinNo; // 车架号 - @ApiModelProperty("车牌号") + @ApiModelProperty("车牌号") private String carNum; // 车牌号 - @ApiModelProperty("客户姓名") + @ApiModelProperty("客户姓名") private String customerName; // 客户姓名 - @ApiModelProperty("客户联系电话") + @ApiModelProperty("客户联系电话") private String customerPhone; // 客户联系电话 - @ApiModelProperty("贷款合同编号") + @ApiModelProperty("贷款合同编号") private String loanContractNo; // 贷款合同编号 - @ApiModelProperty("资方") + @ApiModelProperty("资方") private String bankName; // 资方 @ApiModelProperty("资方合同编号") private String bankContractNo; @ApiModelProperty("贷款人姓名") private String borrowerName; - @ApiModelProperty("首次逾期日期") + @ApiModelProperty("首次逾期日期") private String firstBeDate; // 首次逾期日期 - @ApiModelProperty("逾期金额") + @ApiModelProperty("逾期金额") private String beOverdueMoney; // 逾期金额 - @ApiModelProperty("逾期期数") + @ApiModelProperty("逾期期数") private String beOverduePeriod; // 逾期期数 - @ApiModelProperty("逾期金额换算期数") + @ApiModelProperty("逾期金额换算期数") private String beOverdueMoneyAndPeriod; // 逾期金额换算期数 - @ApiModelProperty("锁车费用") + @ApiModelProperty("锁车费用") private String lockCarMoney; // 锁车费用 - @ApiModelProperty("锁车状态") + @ApiModelProperty("锁车状态") private String lockCarState; // 锁车状态 @ApiModelProperty("销售订单车辆sid") private String saleVehSid; // 销售订单车辆sid - @ApiModelProperty("催收申请sid") + @ApiModelProperty("催收申请sid") private String mainSid; // 催收申请sid } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDbrDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDbrDetailsVo.java index 0658fe4028..9cc4550132 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDbrDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDbrDetailsVo.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loanbecollectionveh; - import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; @@ -35,19 +34,6 @@ import lombok.Data; import java.util.ArrayList; import java.util.List; -/** - * Project: anrui-riskcenter(家访考察)
- * File: LoanHomevisitInvestigateOtherpeoVo.java
- * Class: com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoVo
- * Description: 家访考察-其他人员 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-08-10 15:13:46
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "家访考察-其他人员 视图数据详情", description = "家访考察-其他人员 视图数据详情") public class LoanBeCollectionVehDbrDetailsVo implements Vo { @@ -56,23 +42,23 @@ public class LoanBeCollectionVehDbrDetailsVo implements Vo { @ApiModelProperty("人员身份key") private String peoTypeKey; - @ApiModelProperty("人员身份") + @ApiModelProperty("人员身份") private String peoType; // 人员身份 - @ApiModelProperty("姓名") + @ApiModelProperty("姓名") private String peoName; // 姓名 - @ApiModelProperty("身份证号") + @ApiModelProperty("身份证号") private String idNumber; // 身份证号 - @ApiModelProperty("手机号") + @ApiModelProperty("手机号") private String mobile; // 手机号 - @ApiModelProperty("户籍地址") + @ApiModelProperty("户籍地址") private String peoDomAddress; // 户籍地址 - @ApiModelProperty("现住址") + @ApiModelProperty("现住址") private String peoPreAddress; // 现住址 - @ApiModelProperty("工作单位") + @ApiModelProperty("工作单位") private String workUnit; // 工作单位 - @ApiModelProperty("职业key") + @ApiModelProperty("职业key") private String peoCareerKey; // 职业key - @ApiModelProperty("职业value") + @ApiModelProperty("职业value") private String peoCareerValue; // 职业value @ApiModelProperty("家访考察表sid") private String mainSid; // 家访考察表sid diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDbrDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDbrDto.java index 754c847dac..3bcf6bcf7d 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDbrDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDbrDto.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loanbecollectionveh; - import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo; import com.yxt.common.core.dto.Dto; import com.yxt.common.core.vo.Vo; @@ -36,44 +35,30 @@ import lombok.Data; import java.util.ArrayList; import java.util.List; -/** - * Project: anrui-riskcenter(家访考察)
- * File: LoanHomevisitInvestigateOtherpeoVo.java
- * Class: com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoVo
- * Description: 家访考察-其他人员 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-08-10 15:13:46
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data -@ApiModel(value = "家访考察-其他人员 视图数据详情", description = "家访考察-其他人员 视图数据详情") public class LoanBeCollectionVehDbrDto implements Dto { private String sid; @ApiModelProperty("人员身份key") private String peoTypeKey; - @ApiModelProperty("人员身份") + @ApiModelProperty("人员身份") private String peoType; // 人员身份 - @ApiModelProperty("姓名") + @ApiModelProperty("姓名") private String peoName; // 姓名 - @ApiModelProperty("身份证号") + @ApiModelProperty("身份证号") private String idNumber; // 身份证号 - @ApiModelProperty("手机号") + @ApiModelProperty("手机号") private String mobile; // 手机号 - @ApiModelProperty("户籍地址") + @ApiModelProperty("户籍地址") private String peoDomAddress; // 户籍地址 - @ApiModelProperty("现住址") + @ApiModelProperty("现住址") private String peoPreAddress; // 现住址 - @ApiModelProperty("工作单位") + @ApiModelProperty("工作单位") private String workUnit; // 工作单位 - @ApiModelProperty("职业key") + @ApiModelProperty("职业key") private String peoCareerKey; // 职业key - @ApiModelProperty("职业value") + @ApiModelProperty("职业value") private String peoCareerValue; // 职业value @ApiModelProperty("家访考察表sid") private String mainSid; // 家访考察表sid diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDetailsVo.java index 21a0c0514e..458304b1bc 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDetailsVo.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loanbecollectionveh; - import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo; import com.yxt.common.core.vo.Vo; @@ -39,19 +38,6 @@ import java.util.Date; import java.util.List; import java.util.Map; -/** - * Project: anrui-riskcenter(催收措施申请)
- * File: LoanBeCollectionVehVo.java
- * Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehVo
- * Description: 逾期催收车辆 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-12-12 16:06:20
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "逾期催收车辆 视图数据详情", description = "逾期催收车辆 视图数据详情") public class LoanBeCollectionVehDetailsVo implements Vo { diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDto.java index d7a0bc818b..c2afb84732 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDto.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loanbecollectionveh; - import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo; import com.yxt.common.core.dto.Dto; @@ -36,56 +35,43 @@ import lombok.Data; import java.util.ArrayList; import java.util.List; -/** - * Project: anrui-riskcenter(催收措施申请)
- * File: LoanBeCollectionVehDto.java
- * Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDto
- * Description: 逾期催收车辆 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-12-12 16:06:20
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "逾期催收车辆 数据传输对象", description = "逾期催收车辆 数据传输对象") public class LoanBeCollectionVehDto implements Dto { private String sid; // sid - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String vinNo; // 车架号 - @ApiModelProperty("车牌号") + @ApiModelProperty("车牌号") private String carNum; // 车牌号 @ApiModelProperty("客户名称") private String custName; @ApiModelProperty("联系电话") private String custPhone; - @ApiModelProperty("贷款合同编号") + @ApiModelProperty("贷款合同编号") private String loanContractNo; // 贷款合同编号 - @ApiModelProperty("资方") + @ApiModelProperty("资方") private String bankName; // 资方 @ApiModelProperty("资方合同编号") private String bankContractNo; @ApiModelProperty("贷款人姓名") private String borrowerName; - @ApiModelProperty("首次逾期日期") + @ApiModelProperty("首次逾期日期") private String firstBeDate; // 首次逾期日期 - @ApiModelProperty("逾期金额") + @ApiModelProperty("逾期金额") private String beOverdueMoney; // 逾期金额 - @ApiModelProperty("逾期期数") + @ApiModelProperty("逾期期数") private String beOverduePeriod; // 逾期期数 - @ApiModelProperty("逾期金额换算期数") + @ApiModelProperty("逾期金额换算期数") private String beOverdueMoneyAndPeriod; // 逾期金额换算期数 - @ApiModelProperty("锁车费用") + @ApiModelProperty("锁车费用") private String lockCarMoney; // 锁车费用 - @ApiModelProperty("锁车状态") + @ApiModelProperty("锁车状态") private String lockCarState; // 锁车状态 @ApiModelProperty("销售订单车辆sid") private String saleVehSid; // 销售订单车辆sid - @ApiModelProperty("催收申请sid") + @ApiModelProperty("催收申请sid") private String mainSid; // 催收申请sid @ApiModelProperty diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeignFallback.java index 6ce5bcf841..2ef053922a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeignFallback.java @@ -25,27 +25,11 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loanbecollectionveh; -import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDto; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; -import java.util.List; - -/** - * Project: anrui-riskcenter(催收措施申请)
- * File: LoanBeCollectionVehFeignFallback.java
- * Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFeignFallback
- * Description: 逾期催收车辆.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-12-12 16:06:20
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Component public class LoanBeCollectionVehFeignFallback implements LoanBeCollectionVehFeign { diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFile.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFile.java index c54996ba51..a673c586b2 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFile.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFile.java @@ -25,30 +25,15 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loanbecollectionveh; - import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.util.Date; import java.util.List; import java.util.Map; -/** - * Project: anrui-riskcenter(催收措施申请)
- * File: LoanBeCollectionVehVo.java
- * Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehVo
- * Description: 逾期催收车辆 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-12-12 16:06:20
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "逾期催收车辆 视图数据详情", description = "逾期催收车辆 视图数据详情") public class LoanBeCollectionVehFile implements Vo { diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehInit.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehInit.java index 80ca07dc45..66145363f8 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehInit.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehInit.java @@ -3,7 +3,6 @@ package com.yxt.anrui.riskcenter.api.loanbecollectionveh; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.util.Date; import java.util.List; import java.util.Map; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehQuery.java index 297bf1a970..629a7dac01 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehQuery.java @@ -25,55 +25,41 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loanbecollectionveh; - import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: anrui-riskcenter(催收措施申请)
- * File: LoanBeCollectionVehQuery.java
- * Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehQuery
- * Description: 逾期催收车辆 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-12-12 16:06:20
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "逾期催收车辆 查询条件", description = "逾期催收车辆 查询条件") public class LoanBeCollectionVehQuery implements Query { - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String vinNo; // 车架号 - @ApiModelProperty("车牌号") + @ApiModelProperty("车牌号") private String carNum; // 车牌号 - @ApiModelProperty("客户姓名") + @ApiModelProperty("客户姓名") private String customerName; // 客户姓名 - @ApiModelProperty("客户联系电话") + @ApiModelProperty("客户联系电话") private String customerPhone; // 客户联系电话 - @ApiModelProperty("贷款合同编号") + @ApiModelProperty("贷款合同编号") private String loanContractNo; // 贷款合同编号 - @ApiModelProperty("资方") + @ApiModelProperty("资方") private String bankName; // 资方 - @ApiModelProperty("首次逾期日期") + @ApiModelProperty("首次逾期日期") private String firstBeDate; // 首次逾期日期 - @ApiModelProperty("逾期金额") + @ApiModelProperty("逾期金额") private String beOverdueMoney; // 逾期金额 - @ApiModelProperty("逾期期数") + @ApiModelProperty("逾期期数") private String beOverduePeriod; // 逾期期数 - @ApiModelProperty("逾期金额换算期数") + @ApiModelProperty("逾期金额换算期数") private String beOverdueMoneyAndPeriod; // 逾期金额换算期数 - @ApiModelProperty("锁车费用") + @ApiModelProperty("锁车费用") private String lockCarMoney; // 锁车费用 - @ApiModelProperty("锁车状态") + @ApiModelProperty("锁车状态") private String lockCarState; // 锁车状态 - @ApiModelProperty("催收申请sid") + @ApiModelProperty("催收申请sid") private String mainSid; // 催收申请sid } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehVo.java index 742ca29134..75a68fb5ab 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehVo.java @@ -25,57 +25,41 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loanbecollectionveh; - import com.yxt.common.core.vo.Vo; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: anrui-riskcenter(催收措施申请)
- * File: LoanBeCollectionVehVo.java
- * Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehVo
- * Description: 逾期催收车辆 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-12-12 16:06:20
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "逾期催收车辆 视图数据对象", description = "逾期催收车辆 视图数据对象") public class LoanBeCollectionVehVo implements Vo { private String sid; // sid - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String vinNo; // 车架号 - @ApiModelProperty("车牌号") + @ApiModelProperty("车牌号") private String carNum; // 车牌号 - @ApiModelProperty("客户姓名") + @ApiModelProperty("客户姓名") private String customerName; // 客户姓名 - @ApiModelProperty("客户联系电话") + @ApiModelProperty("客户联系电话") private String customerPhone; // 客户联系电话 - @ApiModelProperty("贷款合同编号") + @ApiModelProperty("贷款合同编号") private String loanContractNo; // 贷款合同编号 - @ApiModelProperty("资方") + @ApiModelProperty("资方") private String bankName; // 资方 - @ApiModelProperty("首次逾期日期") + @ApiModelProperty("首次逾期日期") private String firstBeDate; // 首次逾期日期 - @ApiModelProperty("逾期金额") + @ApiModelProperty("逾期金额") private String beOverdueMoney; // 逾期金额 - @ApiModelProperty("逾期期数") + @ApiModelProperty("逾期期数") private String beOverduePeriod; // 逾期期数 - @ApiModelProperty("逾期金额换算期数") + @ApiModelProperty("逾期金额换算期数") private String beOverdueMoneyAndPeriod; // 逾期金额换算期数 - @ApiModelProperty("锁车费用") + @ApiModelProperty("锁车费用") private String lockCarMoney; // 锁车费用 - @ApiModelProperty("锁车状态") + @ApiModelProperty("锁车状态") private String lockCarState; // 锁车状态 - @ApiModelProperty("催收申请sid") + @ApiModelProperty("催收申请sid") private String mainSid; // 催收申请sid - } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerDetailsVo.java index a21ef0d8b0..24b135f8da 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerDetailsVo.java @@ -25,85 +25,71 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer; - import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: anrui-riskcenter(家访考察)
- * File: LoanHomevisitInvestigateCustomerVo.java
- * Class: com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerVo
- * Description: 家访考察-客户信息 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-08-10 15:13:46
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "家访考察-客户信息 视图数据详情", description = "家访考察-客户信息 视图数据详情") public class LoanHomevisitInvestigateCustomerDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("是否为实际购车人") + @ApiModelProperty("是否为实际购车人") private Boolean isConfirmRealBuyer; // 是否为实际购车人 - @ApiModelProperty("借款人sid") + @ApiModelProperty("借款人sid") private String borrowerSid; // 借款人sid - @ApiModelProperty("借款人姓名") + @ApiModelProperty("借款人姓名") private String borrowerName; // 借款人姓名 - @ApiModelProperty("借款人身份证号") + @ApiModelProperty("借款人身份证号") private String borrowerIdNumber; // 借款人身份证号 - @ApiModelProperty("借款人手机号") + @ApiModelProperty("借款人手机号") private String borrowerMobile; // 借款人手机号 - @ApiModelProperty("借款人职业key") + @ApiModelProperty("借款人职业key") private String borrowerCareerKey; // 借款人职业key - @ApiModelProperty("借款人职业value") + @ApiModelProperty("借款人职业value") private String borrowerCareerValue; // 借款人职业value - @ApiModelProperty("婚姻状况key") + @ApiModelProperty("婚姻状况key") private String maritalStatusKey; // 婚姻状况key - @ApiModelProperty("婚姻状况value") + @ApiModelProperty("婚姻状况value") private String maritalStatusValue; // 婚姻状况value - @ApiModelProperty("有无子女key") + @ApiModelProperty("有无子女key") private String isChildrenKey; // 有无子女key - @ApiModelProperty("有无子女value") + @ApiModelProperty("有无子女value") private String isChildrenValue; // 有无子女value - @ApiModelProperty("借款人户籍地址") + @ApiModelProperty("借款人户籍地址") private String borrowerDomAddress; // 借款人户籍地址 - @ApiModelProperty("借款人现住址") + @ApiModelProperty("借款人现住址") private String borrowerPreAddress; // 借款人现住址 - @ApiModelProperty("银行卡号") + @ApiModelProperty("银行卡号") private String bankCardNo; // 银行卡号 - @ApiModelProperty("开户行") + @ApiModelProperty("开户行") private String depositBank; // 开户行 - @ApiModelProperty("配偶姓名") + @ApiModelProperty("配偶姓名") private String spouseName; // 配偶姓名 - @ApiModelProperty("配偶身份证号") + @ApiModelProperty("配偶身份证号") private String spouseIdNumber; // 配偶身份证号 - @ApiModelProperty("配偶手机号") + @ApiModelProperty("配偶手机号") private String spouseMobile; // 配偶手机号 - @ApiModelProperty("配偶职业key") + @ApiModelProperty("配偶职业key") private String spouseCareerKey; // 配偶职业key - @ApiModelProperty("配偶职业value") + @ApiModelProperty("配偶职业value") private String spouseCareerValue; // 配偶职业value - @ApiModelProperty("配偶户籍地址") + @ApiModelProperty("配偶户籍地址") private String spouseDomAddress; // 配偶户籍地址 - @ApiModelProperty("配偶现住址") + @ApiModelProperty("配偶现住址") private String spousePreAddress; // 配偶现住址 - @ApiModelProperty("紧急联系人") + @ApiModelProperty("紧急联系人") private String emergencyContact; // 紧急联系人 - @ApiModelProperty("紧急联系电话") + @ApiModelProperty("紧急联系电话") private String emergencyMobile; // 紧急联系电话 - @ApiModelProperty("关系key") + @ApiModelProperty("关系key") private String relationshipKey; // 关系key - @ApiModelProperty("关系value") + @ApiModelProperty("关系value") private String relationshipValue; // 关系value - @ApiModelProperty("家访考察表sid") + @ApiModelProperty("家访考察表sid") private String mainSid; // 家访考察表sid @ApiModelProperty("车辆登记在(1客户名下,2挂靠公司名下)") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/AlrepaidAndArrVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/AlrepaidAndArrVo.java index 2615a7cc59..1f4e7baf77 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/AlrepaidAndArrVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/AlrepaidAndArrVo.java @@ -37,20 +37,20 @@ import java.util.List; @Data public class AlrepaidAndArrVo implements Vo { - @ApiModelProperty("已还金额") + @ApiModelProperty("已还金额") private String alRepaidMoney; // 已还金额 - @ApiModelProperty("当前逾期金额") + @ApiModelProperty("当前逾期金额") private String currentBeMoney; // 当前逾期金额 - @ApiModelProperty("其中资金占用费") + @ApiModelProperty("其中资金占用费") private String wheFundOccMoney; // 其中资金占用费 - @ApiModelProperty("未到期金额") + @ApiModelProperty("未到期金额") private String unexpiredMoney; // 未到期金额 - @ApiModelProperty("总期数") + @ApiModelProperty("总期数") private String nper; // 总期数 - @ApiModelProperty("当前期数") + @ApiModelProperty("当前期数") private String currentPeriod; // 当前期数 - @ApiModelProperty("已还金额换算期数") + @ApiModelProperty("已还金额换算期数") private String alRepaidMoneyConPeriod; // 已还金额换算期数 - @ApiModelProperty("逾期金额换算期数") + @ApiModelProperty("逾期金额换算期数") private String beOverdueMoneyAndPeriod; // 逾期金额换算期数 } \ No newline at end of file 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 60f05d6456..92eec1ce73 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 @@ -30,6 +30,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower; +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.fin.api.finvehicleinvoice.FinVehicleInvoice; @@ -65,19 +67,6 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; -/** - * Project: anrui-riskcenter(逾期催收记录)
- * File: LoanBeCollectionRecordService.java
- * Class: com.yxt.anrui.riskcenter.biz.loanbecollectionrecord.LoanBeCollectionRecordService
- * Description: 逾期催收记录 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-12-11 13:45:40
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class LoanBeCollectionRecordService extends MybatisBaseService { @@ -98,7 +87,7 @@ public class LoanBeCollectionRecordService extends MybatisBaseService loanBeCollectionRecordVehInits = loanBeOverdueVehService.initVehListByBorrSid(busSalesOrderVehicle.getBorrowerSid()); for (LoanBeCollectionRecordVehInit loanBeCollectionRecordVehInit : loanBeCollectionRecordVehInits) { List loanBeCollectionVehFiles = new ArrayList<>(); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java index fbbe69815a..ae2e296ecd 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java @@ -63,4 +63,7 @@ public interface LoanBeCollectionVehMapper extends BaseMapper dbrsfzs = loanHomevisitInvestigateFileService.selBySaleVehSidAndTypeKey(saleVehSid, LoanAttachTypeEnum.DBRSFZ.getAttachType()); List sfzs = new ArrayList<>(); if (dbrsfzs != null && dbrsfzs.size() > 0){ 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 568a9c30ca..2b1e70bdda 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 @@ -90,7 +90,7 @@ WHERE lbca.collMeasure LIKE '%远程控制%' AND lbca.nodeState = '已办结' ) lbcv ON lbcv.saleVehSid = lrpd.busVinSid AND lbcv.rn = 1 - WHERE lrpd.dueDate < CURDATE() -- 移除DATE_FORMAT函数 + WHERE lrpd.dueDate <= lrpd.updateTime -- 移除DATE_FORMAT函数 GROUP BY lrpd.sid HAVING (lrpd.dueMoney - COALESCE(SUM(lrh.actualMoney), 0)) > 0 ) a1 @@ -108,7 +108,7 @@ FROM loan_fund_day lfd JOIN loan_repayment_plan_details lrpd ON lrpd.sid = lfd.busSid - WHERE lrpd.dueDate < CURDATE() + WHERE lrpd.dueDate <= lrpd.updateTime GROUP BY lrpd.busVinSid ) lfd_sum ON lfd_sum.busVinSid = a1.busVinSid @@ -147,7 +147,8 @@ ) AS beOverdueMoneyAndPeriod, a1.busVinSid AS saleVehSid, MAX(a1.salesOrderSid) AS salesOrderSid, - MAX(a1.lockCarState) AS lockCarState + MAX(a1.lockCarState) AS lockCarState, + a1.nowOverdue FROM ( SELECT lrpd.sid, @@ -168,7 +169,8 @@ ct.mobile, lrpd.borrowerSid, lrpd.salesOrderSid, - lbcv_agg.lockCarState + lbcv_agg.lockCarState, + if(lrpd.dueDate <= lrpd.updateTime,0,1) as nowOverdue FROM loan_repayment_plan_details lrpd LEFT JOIN loan_repayment_history lrh @@ -233,6 +235,7 @@ ) a1 WHERE a1.borrowerSid = #{borrowerSid} + AND a1.nowOverdue = 0 GROUP BY a1.loanContractNo, a1.vinNo, @@ -283,7 +286,8 @@ MAX(a1.reaRepaymentName) AS repaymentName, MAX(a1.createTime) AS createTime, a1.orgSidPath, - MAX(a1.lockCarState) AS lockCarState -- 保证聚合正确性 + MAX(a1.lockCarState) AS lockCarState, -- 保证聚合正确性 + a1.nowOverdue FROM ( SELECT lrpd.sid, @@ -313,87 +317,7 @@ WHEN 2 THEN '控制失败' WHEN 3 THEN '已解控' END AS lockCarState, - CASE - WHEN lrpd.dueDate > lrpd.updateTime or lrpd.updateTime IS NULL THEN '1' - WHEN lrpd.dueDate <= lrpd.updateTime AND (IFNULL( - ( - lrpd.dueMoney - IFNULL(( - SELECT - SUM( - IFNULL( lrh.actualMoney, 0 )) - FROM - loan_repayment_history AS lrh - WHERE - lrh.planDetailSid = lrpd.sid - AND lrh.updateState = '1' - ), - 0 - )), - 0 - ) + IFNULL(( - SELECT - ( fjj.reveivableMoney - fjj.m ) - FROM - ( - SELECT - IFNULL(( - SELECT - SUM( subscriptionMoney ) - FROM - anrui_fin.fin_selected_receivables_detailed AS s - WHERE - s.auditState = '3' - AND s.receivablesSid = fj.sid - ), - 0 - ) AS m, - fj.* - FROM - ( SELECT j.busSid, j.sid, j.reveivableMoney FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS j WHERE j.payCostTitleKey = '006' ) AS fj - ) AS fjj - WHERE - fjj.busSid = lrpd.sid - ),0) + IFNULL(lrpd.paymentInterest,0)) > 0 THEN '0' - WHEN lrpd.dueDate <= lrpd.updateTime AND (IFNULL( - ( - lrpd.dueMoney - IFNULL(( - SELECT - SUM( - IFNULL( lrh.actualMoney, 0 )) - FROM - loan_repayment_history AS lrh - WHERE - lrh.planDetailSid = lrpd.sid - AND lrh.updateState = '1' - ), - 0 - )), - 0 - ) + IFNULL(( - SELECT - ( fjj.reveivableMoney - fjj.m ) - FROM - ( - SELECT - IFNULL(( - SELECT - SUM( subscriptionMoney ) - FROM - anrui_fin.fin_selected_receivables_detailed AS s - WHERE - s.auditState = '3' - AND s.receivablesSid = fj.sid - ), - 0 - ) AS m, - fj.* - FROM - ( SELECT j.busSid, j.sid, j.reveivableMoney FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS j WHERE j.payCostTitleKey = '006' ) AS fj - ) AS fjj - WHERE - fjj.busSid = lrpd.sid - ),0) + IFNULL(lrpd.paymentInterest,0)) <= 0 THEN '1' - END AS nowOverdue + if(lrpd.dueDate <= lrpd.updateTime,0,1) as nowOverdue FROM loan_repayment_plan_details lrpd LEFT JOIN loan_repayment_history lrh ON lrh.planDetailSid = lrpd.sid diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java index 07aeb2f54e..05200265f4 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java @@ -164,6 +164,7 @@ public class LoanBeOverdueVehService { if (StringUtils.isNotBlank(query.getNames())) { qw.and(wrapper -> wrapper.like("a1.loanContractNo", query.getNames()).or().like("a1.borrowerName", query.getNames()).or().like("a1.vinNo", query.getNames())); } + qw.eq("a1.nowOverdue", "0"); String collectionStartDate = query.getCollectionStartDate(); String collectionEndDate = query.getCollectionEndDate(); qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (a1.createTime,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')"). @@ -283,6 +284,7 @@ public class LoanBeOverdueVehService { if (StringUtils.isNotBlank(query.getVinNo())) { qw.like("a1.vinNo", query.getVinNo()); } + qw.eq("a1.nowOverdue", "0"); String collectionStartDate = query.getCollectionStartDate(); String collectionEndDate = query.getCollectionEndDate(); qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (a1.createTime,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')"). diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java index cdf3018152..82e8e19af1 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java @@ -886,7 +886,7 @@ public class LoanDiffService extends MybatisBaseService SELECT - IFNULL(SUM(lrh.`actualMoney`),0) + IFNULL(SUM(lrh.actualMoney),0) FROM (SELECT DISTINCT scheduleSid @@ -44,16 +44,16 @@ loan_repayment_plan_details WHERE busVinSid = #{saleVehSid}) lrpd LEFT JOIN loan_repayment_history lrh - ON lrpd.`scheduleSid` = lrh.`scheduleSid` + ON lrpd.scheduleSid = lrh.scheduleSid WHERE lrh.updateState = '1' SELECT - a1.`loanContractNo`, + a1.loanContractNo, RIGHT (a1.vinNo, 8) AS vinNo, a1.vehMark AS carNum, - a1.`bankName`, + a1.bankName, a1.bankContractNo, a1.customer AS custName, a1.borrowerName AS loanName, @@ -217,23 +217,154 @@ (SELECT lrpd.sid, lrpd.busVinSid, - lrpd.`loanContractNo`, + lrpd.loanContractNo, lrpd.bankContractNo, - lrpd.`vinNo`, + lrpd.vinNo, lrpd.vehMark, lrpd.customer, lrpd.borrowerName, - lrpd.`bankName`, - lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0)) AS yq_total, + lrpd.bankName, + lrpd.dueMoney - SUM(IFNULL(lrh.actualMoney, 0)) AS yq_total, lrpd.salesOrderSid FROM loan_repayment_plan_details lrpd - LEFT JOIN `loan_repayment_history` lrh - ON lrh.planDetailSid = lrpd.`sid` + LEFT JOIN loan_repayment_history lrh + ON lrh.planDetailSid = lrpd.sid WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < CURDATE() - GROUP BY lrpd.`sid` + GROUP BY lrpd.sid HAVING (yq_total > 0)) a1 WHERE a1.busVinSid = #{saleVehSid} GROUP BY a1.busVinSid + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java index 096cb5833e..2a3c9a017c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java @@ -87,19 +87,6 @@ import org.springframework.stereotype.Service; import java.util.*; import java.util.stream.Collectors; -/** - * Project: anrui-riskcenter(车辆交回事前报备申请)
- * File: LoanRestoreReportApplyService.java
- * Class: com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService
- * Description: 车辆交回事前报备申请 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-01-08 11:43:57
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class LoanRestoreReportApplyService extends MybatisBaseService { @@ -351,7 +338,7 @@ public class LoanRestoreReportApplyService extends MybatisBaseService ${ew.sqlSegment} @@ -68,83 +68,37 @@