diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java index 38376c5367..385899ea4d 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java @@ -33,19 +33,6 @@ import lombok.Data; import java.math.BigDecimal; -/** - * Project: anrui-fin(销售相关)
- * File: FinCollectionConfirmation.java
- * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation
- * Description: 收款确认表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-04-12 17:57:01
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @ApiModel(value = "收款确认表", description = "收款确认表") @Data @TableName("fin_collection_confirmation") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java index 372fc655a5..a9a9faadf8 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java @@ -25,52 +25,38 @@ *********************************************************/ package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed; - import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: anrui-fin(销售相关)
- * File: FinUncollectedReceivablesDetailedDto.java
- * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto
- * Description: 应收未收款项明细表 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-04-12 17:57:01
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @ApiModel(value = "应收未收款项明细表 数据传输对象", description = "应收未收款项明细表 数据传输对象") @Data public class FinUncollectedReceivablesDetailedDto implements Dto { @ApiModelProperty("应收未收款项sid") private String sid; // 应收未收款项sid - @ApiModelProperty("创建人接口") + @ApiModelProperty("创建人接口") private String createByName; // 创建人接口 @ApiModelProperty("创建人sid") private String createBySid; // 创建人sid - @ApiModelProperty("合同sid") + @ApiModelProperty("合同sid") private String contractSid; // 合同sid - @ApiModelProperty("合同编号") + @ApiModelProperty("合同编号") private String contractNo; // 合同编号 - @ApiModelProperty("客户sid") + @ApiModelProperty("客户sid") private String customerSid; // 客户sid - @ApiModelProperty("客户名称") + @ApiModelProperty("客户名称") private String customerName; // 客户名称 - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String VIN; // 车架号 - @ApiModelProperty("分公司sid") + @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid - @ApiModelProperty("联系电话") + @ApiModelProperty("联系电话") private String customerPhone; // 联系电话 - @ApiModelProperty("应收项目名称") + @ApiModelProperty("应收项目名称") private String receivablesName; // 应收项目名称 - @ApiModelProperty("当前应收金额") + @ApiModelProperty("当前应收金额") private String currentReceivableMoney; // 当前应收金额 @ApiModelProperty("应收金额(不变)") private String reveivableMoney; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java index f4b4d71ceb..4cfa4bcb69 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java @@ -34,23 +34,9 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; - import java.math.BigDecimal; import java.util.List; -/** - * Project: anrui-fin(应收未收款项明细表)
- * File: FinUncollectedReceivablesDetailedFeign.java
- * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign
- * Description: 应收未收款项明细表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-04-12 17:57:01
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "应收未收款项明细表") @FeignClient( contextId = "anrui-fin-FinUncollectedReceivablesDetailed", diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJR.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJR.java index f4a2b99e31..2423f74535 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJR.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJR.java @@ -33,19 +33,6 @@ import lombok.Data; import java.math.BigDecimal; -/** - * Project: anrui-fin(销售相关)
- * File: FinUncollectedReceivablesDetailed.java
- * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed
- * Description: 应收未收款项明细表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-04-12 17:57:01
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @ApiModel(value = "金融认款应收未收款项明细表", description = "金融认款应收未收款项明细表") @Data @TableName("fin_uncollected_receivables_detailed_jr") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeign.java index f856da9515..e6c150f103 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeign.java @@ -38,19 +38,6 @@ import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; import java.util.List; -/** - * Project: anrui-fin(应收未收款项明细表)
- * File: FinUncollectedReceivablesDetailedFeign.java
- * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign
- * Description: 应收未收款项明细表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-04-12 17:57:01
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "金融认款应收未收款项明细表") @FeignClient( contextId = "anrui-fin-FinUncollectedReceivablesDetailedJR", diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 2f6cbf7f05..8bcd4a22be 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -150,19 +150,6 @@ import java.util.concurrent.*; import java.util.function.Predicate; import java.util.stream.Collectors; -/** - * Project: anrui-fin(销售相关)
- * File: FinCollectionConfirmationService.java
- * Class: com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService
- * Description: 收款确认表 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-04-12 17:57:01
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class FinCollectionConfirmationService extends MybatisBaseService { public static final Logger log = LoggerFactory.getLogger(FinCollectionConfirmationService.class); @@ -205,8 +192,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService - * File: FinUncollectedReceivablesDetailedFeignFallback.java
- * Class: com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedRest
- * Description: 应收未收款项明细表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-04-12 17:57:01
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "应收未收款项明细表") -@RestController("com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedRest") +@RestController @RequestMapping("/finuncollectedreceivablesdetailed") public class FinUncollectedReceivablesDetailedRest implements FinUncollectedReceivablesDetailedFeign { diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeign.java index 95c406ae4c..2d3fde5b51 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeign.java @@ -25,8 +25,6 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loanbecollectionveh; -import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDetailsVo; -import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; @@ -35,21 +33,6 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -import java.util.List; - -/** - * Project: anrui-riskcenter(催收措施申请)
- * File: LoanBeCollectionVehFeign.java
- * Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFeign
- * 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 - */ @Api(tags = "逾期催收车辆") @FeignClient( contextId = "anrui-riskcenter-LoanBeCollectionVeh", @@ -67,12 +50,12 @@ public interface LoanBeCollectionVehFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody LoanBeCollectionVehDto dto); - + @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); - + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceapply/LoanVehClearanceApply.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceapply/LoanVehClearanceApply.java index be240effba..a7ad0caf05 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceapply/LoanVehClearanceApply.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceapply/LoanVehClearanceApply.java @@ -31,48 +31,35 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: anrui-riskcenter(车辆远程解控申请)
- * File: LoanVehClearanceApply.java
- * Class: com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApply
- * Description: 车辆远程解控申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-12-29 10:25:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "车辆远程解控申请", description = "车辆远程解控申请") @TableName("loan_veh_clearance_apply") public class LoanVehClearanceApply extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("创建人") + @ApiModelProperty("创建人") private String createByName; // 创建人 - @ApiModelProperty("申请编号") + @ApiModelProperty("申请编号") private String billNo; // 申请编号 - @ApiModelProperty("申请部门sid") + @ApiModelProperty("申请部门sid") private String deptSid; // 申请部门sid - @ApiModelProperty("申请部门名称") + @ApiModelProperty("申请部门名称") private String deptName; // 申请部门名称 - @ApiModelProperty("分公司sid") + @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid - @ApiModelProperty("分公司名称") + @ApiModelProperty("分公司名称") private String useOrgName; // 分公司名称 - @ApiModelProperty("组织全路径") + @ApiModelProperty("组织全路径") private String orgPath; // 组织全路径 - @ApiModelProperty("流程定义的id") + @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") + @ApiModelProperty("环节定义的sid") private String nodeSid; // 环节定义的sid - @ApiModelProperty("流程实例的sid") + @ApiModelProperty("流程实例的sid") private String procInstSid; // 流程实例的sid - @ApiModelProperty("流程状态") + @ApiModelProperty("流程状态") private String nodeState; // 流程状态 - @ApiModelProperty("任务id") + @ApiModelProperty("任务id") private String taskId; // 任务id } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceapply/LoanVehClearanceApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceapply/LoanVehClearanceApplyFeign.java index a90cade1f1..a163cded7d 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceapply/LoanVehClearanceApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceapply/LoanVehClearanceApplyFeign.java @@ -25,12 +25,9 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loanvehclearanceapply; -import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDetailsVo; -import com.yxt.anrui.riskcenter.api.loanbecollectionapply.flowable.*; import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.flowable.*; import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarQuery; import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarVo; -import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDetailsVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; @@ -39,23 +36,9 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; - import javax.validation.Valid; import java.util.List; -/** - * Project: anrui-riskcenter(车辆远程解控申请)
- * File: LoanVehClearanceApplyFeign.java
- * Class: com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApplyFeign
- * Description: 车辆远程解控申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-12-29 10:25:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "车辆远程解控申请") @FeignClient( contextId = "anrui-riskcenter-LoanVehClearanceApply", @@ -78,7 +61,7 @@ public interface LoanVehClearanceApplyFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody LoanVehClearanceApplyDto dto); - + @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody @@ -88,7 +71,7 @@ public interface LoanVehClearanceApplyFeign { @PostMapping("/init") @ResponseBody public ResultBean init(@RequestBody LoanVehClearanceInitQuery loanVehClearanceInitQuery); - + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehDetailsVo.java index 03b62113da..ef7df1378c 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehDetailsVo.java @@ -25,11 +25,8 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loanvehclearanceveh; - import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFile; import com.yxt.common.core.vo.Vo; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -37,55 +34,42 @@ import lombok.Data; import java.util.Date; import java.util.List; -/** - * Project: anrui-riskcenter(车辆远程解控申请)
- * File: LoanVehClearanceVehVo.java
- * Class: com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehVo
- * Description: 车辆远程解控车辆 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-12-29 10:25:57
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "车辆远程解控车辆 视图数据详情", description = "车辆远程解控车辆 视图数据详情") public class LoanVehClearanceVehDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("贷款合同编号") + @ApiModelProperty("贷款合同编号") private String loanContractNo; // 贷款合同编号 - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String vinNo; // 车架号 - @ApiModelProperty("车牌号") + @ApiModelProperty("车牌号") private String carNum; // 车牌号 - @ApiModelProperty("资方") + @ApiModelProperty("资方") private String bankName; // 资方 - @ApiModelProperty("资方合同号") + @ApiModelProperty("资方合同号") private String bankContractNo; // 资方合同号 - @ApiModelProperty("客户姓名") + @ApiModelProperty("客户姓名") private String customerName; // 客户姓名 - @ApiModelProperty("贷款人姓名") + @ApiModelProperty("贷款人姓名") private String borrowerName; // 贷款人姓名 @ApiModelProperty("首次逾期日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date firstBeDate; - @ApiModelProperty("逾期期数") + @ApiModelProperty("逾期期数") private String beOverduePeriod; // 逾期期数 - @ApiModelProperty("逾期金额") + @ApiModelProperty("逾期金额") private String beOverdueMoney; // 逾期金额 - @ApiModelProperty("逾期金额换算期数") + @ApiModelProperty("逾期金额换算期数") private String beOverdueMoneyAndPeriod; // 逾期金额换算期数 - @ApiModelProperty("远程控制费用") + @ApiModelProperty("远程控制费用") private String lockCarMoney; // 远程控制费用 - @ApiModelProperty("远程控制费实收") + @ApiModelProperty("远程控制费实收") private String lockCarRealityMoney; // 远程控制费实收 - @ApiModelProperty("销售订单车辆sid") + @ApiModelProperty("销售订单车辆sid") private String saleVehSid; // 销售订单车辆sid - @ApiModelProperty("远程控制申请sid") + @ApiModelProperty("远程控制申请sid") private String mainSid; // 远程控制申请sid @ApiModelProperty 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 cc6a5b2841..fbbe69815a 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 @@ -36,47 +36,31 @@ import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehVo; import java.util.List; -/** - * Project: anrui-riskcenter(催收措施申请)
- * File: LoanBeCollectionVehMapper.java
- * Class: com.yxt.anrui.riskcenter.biz.loanbecollectionveh.LoanBeCollectionVehMapper
- * 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 - */ @Mapper public interface LoanBeCollectionVehMapper extends BaseMapper { - //@Update("update loan_be_collection_veh set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from loan_be_collection_veh") - List selectListVo(); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - @Delete("delete from loan_be_collection_veh where mainSid = #{dtoSid}") + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from loan_be_collection_veh") + List selectListVo(); + + @Delete("delete from loan_be_collection_veh where mainSid = #{dtoSid}") void delByMainSid(String dtoSid); - @Select("select *,customerName as custName,customerPhone as custPhone from loan_be_collection_veh where mainSid = #{sid}") - List selByMainSid(String sid); + @Select("select *,customerName as custName,customerPhone as custPhone from loan_be_collection_veh where mainSid = #{sid}") + List selByMainSid(String sid); - @Update("update loan_be_collection_veh set lockCarState = '0' where mainSid = #{businessSid}") + @Update("update loan_be_collection_veh set lockCarState = '0' where mainSid = #{businessSid}") void updateByMainSid(String businessSid); int selBjBySaleVehSid(String saleVehSid); - int selKzStateBySaleVehSid(@Param("saleVehSid") String saleVehSid,@Param("mainSid") String mainSid); + int selKzStateBySaleVehSid(@Param("saleVehSid") String saleVehSid, @Param("mainSid") String mainSid); - String selSidBySaleVehSidAndLockState(@Param("saleVehSid") String saleVehSid,@Param("c") String c); + String selSidBySaleVehSidAndLockState(@Param("saleVehSid") String saleVehSid, @Param("c") String c); - @Update("update loan_be_collection_veh set lockCarState = #{s} where saleVehSid = #{saleVehSid} and lockCarState = #{x}") - void updateLockState(@Param("saleVehSid") String saleVehSid,@Param("s") String s,@Param("x") String x); + @Update("update loan_be_collection_veh set lockCarState = #{s} where saleVehSid = #{saleVehSid} and lockCarState = #{x}") + void updateLockState(@Param("saleVehSid") String saleVehSid, @Param("s") String s, @Param("x") String x); } \ No newline at end of file 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 61f3d3f313..7270801ed8 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 @@ -33,7 +33,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, @@ -62,7 +63,88 @@ WHEN 1 THEN '控制成功' WHEN 2 THEN '控制失败' WHEN 3 THEN '已解控' - END AS lockCarState + END AS lockCarState, + CASE + WHEN lrpd.dueDate > lrpd.updateDate or lrpd.updateDate IS NULL THEN '1' + WHEN lrpd.dueDate <= lrpd.updateDate 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.updateDate 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 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 a461530ba7..07aeb2f54e 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 @@ -106,6 +106,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/loanvehclearanceapply/LoanVehClearanceApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.java index 10152a5acf..7e4e55da94 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.java @@ -41,33 +41,17 @@ import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApplyV import java.util.List; import java.util.Map; -/** - * Project: anrui-riskcenter(车辆远程解控申请)
- * File: LoanVehClearanceApplyMapper.java
- * Class: com.yxt.anrui.riskcenter.biz.loanvehclearanceapply.LoanVehClearanceApplyMapper
- * Description: 车辆远程解控申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-12-29 10:25:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Mapper public interface LoanVehClearanceApplyMapper extends BaseMapper { - //@Update("update loan_veh_clearance_apply set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from loan_veh_clearance_apply") - List selectListVo(); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - String selectNum(String billNo); + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from loan_veh_clearance_apply") + List selectListVo(); + + String selectNum(String billNo); IPage lockCarList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); @@ -75,5 +59,5 @@ public interface LoanVehClearanceApplyMapper extends BaseMapper - * File: LoanVehClearanceApplyFeignFallback.java
- * Class: com.yxt.anrui.riskcenter.biz.loanvehclearanceapply.LoanVehClearanceApplyRest
- * Description: 车辆远程解控申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-12-29 10:25:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "车辆远程解控申请") -@RestController("com.yxt.anrui.riskcenter.biz.loanvehclearanceapply.LoanVehClearanceApplyRest") +@RestController @RequestMapping("v1/loanvehclearanceapply") public class LoanVehClearanceApplyRest implements LoanVehClearanceApplyFeign { - @Autowired - private LoanVehClearanceApplyService loanVehClearanceApplyService; - - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = loanVehClearanceApplyService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - public ResultBean> lockCarList(PagerQuery pq) { - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = loanVehClearanceApplyService.lockCarList(pq); - return rb.success().setData(pv); - } - - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody LoanVehClearanceApplyDto dto){ - ResultBean rb = ResultBean.fireFail(); - loanVehClearanceApplyService.saveOrUpdateDto(dto); - return rb.success(); - } - - @Override - @ApiOperation("根据sid批量删除") + @Autowired + private LoanVehClearanceApplyService loanVehClearanceApplyService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = loanVehClearanceApplyService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean> lockCarList(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = loanVehClearanceApplyService.lockCarList(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody LoanVehClearanceApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + loanVehClearanceApplyService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - return loanVehClearanceApplyService.delAllBySids(sids); - } - - @Override - public ResultBean init(LoanVehClearanceInitQuery loanVehClearanceInitQuery) { - ResultBean rb = ResultBean.fireFail(); - LoanVehClearanceApplyDetailsVo loanVehClearanceApplyDetailsVo = loanVehClearanceApplyService.init(loanVehClearanceInitQuery); - return rb.success().setData(loanVehClearanceApplyDetailsVo); - } - - @Override - @ApiOperation("根据SID获取一条记录") + public ResultBean delBySids(@RequestBody String[] sids) { + return loanVehClearanceApplyService.delAllBySids(sids); + } + + @Override + public ResultBean init(LoanVehClearanceInitQuery loanVehClearanceInitQuery) { + ResultBean rb = ResultBean.fireFail(); + LoanVehClearanceApplyDetailsVo loanVehClearanceApplyDetailsVo = loanVehClearanceApplyService.init(loanVehClearanceInitQuery); + return rb.success().setData(loanVehClearanceApplyDetailsVo); + } + + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - LoanVehClearanceApplyDetailsVo vo = loanVehClearanceApplyService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } - - @Override - public ResultBean submit(SubmitLoanVehClearanceApplyDto dto) { - return loanVehClearanceApplyService.submit(dto); - } - - @Override - public ResultBean complete(LoanVehClearanceApplyCompleteDto query) { - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.LOANVEHCLEARANCEAPPLY.getProDefId()); - return loanVehClearanceApplyService.complete(bv); - } - - @Override - public ResultBean> getPreviousNodesForReject(LoanVehClearanceApplyNodeQuery query) { - return loanVehClearanceApplyService.getPreviousNodesForReject(query); - } - - @Override - public ResultBean> getNextNodesForSubmit(LoanVehClearanceApplyNodeQuery query) { - return loanVehClearanceApplyService.getNextNodesForSubmit(query); - } - - @Override - public ResultBean reject(LoanVehClearanceApplyTaskQuery query) { - return loanVehClearanceApplyService.reject(query); - } - - @Override - public ResultBean revokeProcess(LoanVehClearanceApplyTaskQuery query) { - return loanVehClearanceApplyService.revokeProcess(query); - } - - @Override - public ResultBean breakProcess(LoanVehClearanceApplyTaskQuery query) { - return loanVehClearanceApplyService.breakProcess(query); - } - - @Override - public ResultBean delegate(LoanVehClearanceApplyDelegateQuery query) { - return loanVehClearanceApplyService.delegate(query); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanVehClearanceApplyDetailsVo vo = loanVehClearanceApplyService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + + @Override + public ResultBean submit(SubmitLoanVehClearanceApplyDto dto) { + return loanVehClearanceApplyService.submit(dto); + } + + @Override + public ResultBean complete(LoanVehClearanceApplyCompleteDto query) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(ProcDefEnum.LOANVEHCLEARANCEAPPLY.getProDefId()); + return loanVehClearanceApplyService.complete(bv); + } + + @Override + public ResultBean> getPreviousNodesForReject(LoanVehClearanceApplyNodeQuery query) { + return loanVehClearanceApplyService.getPreviousNodesForReject(query); + } + + @Override + public ResultBean> getNextNodesForSubmit(LoanVehClearanceApplyNodeQuery query) { + return loanVehClearanceApplyService.getNextNodesForSubmit(query); + } + + @Override + public ResultBean reject(LoanVehClearanceApplyTaskQuery query) { + return loanVehClearanceApplyService.reject(query); + } + + @Override + public ResultBean revokeProcess(LoanVehClearanceApplyTaskQuery query) { + return loanVehClearanceApplyService.revokeProcess(query); + } + + @Override + public ResultBean breakProcess(LoanVehClearanceApplyTaskQuery query) { + return loanVehClearanceApplyService.breakProcess(query); + } + + @Override + public ResultBean delegate(LoanVehClearanceApplyDelegateQuery query) { + return loanVehClearanceApplyService.delegate(query); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyService.java index 2771dc74c5..240eb08076 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyService.java @@ -31,13 +31,14 @@ import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; -import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice; -import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRFeign; import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; @@ -54,10 +55,6 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; -import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApply; -import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo; -import com.yxt.anrui.riskcenter.api.loanbecollectionapply.flowable.LoanBeCollectionApplyNodeVo; -import com.yxt.anrui.riskcenter.api.loanbecollectionapply.flowable.SubmitLoanBeCollectionApplyDto; import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; @@ -88,19 +85,6 @@ import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; -/** - * Project: anrui-riskcenter(车辆远程解控申请)
- * File: LoanVehClearanceApplyService.java
- * Class: com.yxt.anrui.riskcenter.biz.loanvehclearanceapply.LoanVehClearanceApplyService
- * Description: 车辆远程解控申请 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-12-29 10:25:56
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class LoanVehClearanceApplyService extends MybatisBaseService { @@ -121,8 +105,6 @@ public class LoanVehClearanceApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { LoanVehClearanceApplyQuery query = pq.getParams(); @@ -511,9 +495,9 @@ public class LoanVehClearanceApplyService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); @@ -694,7 +700,7 @@ public class LoanVehClearanceApplyService extends MybatisBaseService