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-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/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/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/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,21 +217,21 @@ (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 @@ -318,6 +318,5 @@ GROUP BY lrpd.busVinSid ) lfd_sum ON lfd_sum.busVinSid = ss.busVinSid GROUP BY ss.busVinSid - \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/fkce.ftl b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/fkce.ftl index b6a981384f..11b34f21ce 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/fkce.ftl +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/fkce.ftl @@ -31,15 +31,15 @@ 10745413@qq.com 2 0 - 2025-04-17T07:20:00Z - 2025-04-17T08:41:00Z - 2025-04-17T08:41:00Z + 2025-04-18T09:05:00Z + 2025-04-18T09:06:00Z + 2025-04-18T09:06:00Z 1 192 - 564 - 94 + 560 + 93 107 - 649 + 645 16 @@ -1111,7 +1111,7 @@ - + @@ -1124,7 +1124,7 @@ - + @@ -1139,7 +1139,7 @@ - + @@ -1152,7 +1152,7 @@ - + @@ -1185,10 +1185,12 @@ + + @@ -1201,17 +1203,17 @@ + - - + @@ -1219,12 +1221,15 @@ + + + @@ -1236,14 +1241,12 @@ - - + + - - - + @@ -1272,14 +1275,15 @@ - + + - - + + @@ -1323,14 +1327,15 @@ - + + - - + + @@ -1574,14 +1579,15 @@ - + + - - + + @@ -1825,13 +1831,14 @@ - + + - + @@ -1872,8 +1879,8 @@ - - + + @@ -2075,14 +2082,14 @@ - + + - - + @@ -2333,14 +2340,14 @@ - + + - - + @@ -2996,14 +3003,14 @@ <#list wlList as wl> - + + - - + @@ -3014,7 +3021,7 @@ - @@ -3668,15 +3675,15 @@ - + + - + - @@ -3719,8 +3726,8 @@ <#if (lc_index==0)> - - + + @@ -3835,7 +3842,7 @@ - ${lc.spsj!} + ${lc.spsj} @@ -3844,15 +3851,15 @@ <#list lcList as lc> <#if (lc_index>0)> - + + - + - @@ -3883,8 +3890,8 @@ - - + + @@ -4004,21 +4011,22 @@ - ${lc.spsj!} + ${lc.spsj} - + + - - + + @@ -4175,9 +4183,9 @@ - + - diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java index 2e43e4304e..d314b1bff1 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java @@ -660,7 +660,12 @@ public class ScmVehicleExamineService extends MybatisBaseService 1) { + return rb.setMsg("该车架号已存在，请勿重复验车！"); + } + } + if ("002".equals(dto.getPurchaseKey()) || "003".equals(dto.getPurchaseKey())){ if (countByVinNo > 0) { return rb.setMsg("该车架号已存在，请勿重复验车！"); }