From e1b5385e11f1c27081e071e23b64456efd949fca Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 30 May 2025 16:51:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanCaseCloseApplyDetailsVo.java | 84 +++---- .../LoanCaseCloseApplyDto.java | 88 +++----- .../LoanCaseCloseApplyFeign.java | 4 +- .../loancasecloseveh/LoanCaseCloseVeh.java | 26 +-- .../LoanCaseCloseVehDetailsVo.java | 26 +-- .../loancasecloseveh/LoanCaseCloseVehDto.java | 26 +-- .../LoanCaseCloseVehFeign.java | 78 ------- .../LoanCaseCloseVehFeignFallback.java | 72 ------ .../LoanCaseCloseVehQuery.java | 63 ------ .../loancasecloseveh/LoanCaseCloseVehVo.java | 65 ------ .../LoanCaseCloseApplyRest.java | 179 +++++++-------- .../LoanCaseCloseApplyService.java | 210 ++++++++++++++++-- .../LoanCaseCloseVehMapper.java | 34 +-- .../LoanCaseCloseVehMapper.xml | 7 - .../LoanCaseCloseVehRest.java | 68 +----- .../LoanCaseCloseVehService.java | 91 +++----- 16 files changed, 405 insertions(+), 716 deletions(-) delete mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVehFeign.java delete mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVehFeignFallback.java delete mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVehQuery.java delete mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVehVo.java diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDetailsVo.java index d201e9dff1..ac1306938d 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDetailsVo.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loancasecloseapply; - import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehDetailsVo; import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehDto; @@ -40,19 +39,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -/** - * Project: anrui-riskcenter(案件结案申请)
- * File: LoanCaseCloseApplyVo.java
- * Class: com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseApplyVo
- * Description: 案件结案申请 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-02-08 11:07:38
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "案件结案申请 视图数据详情", description = "案件结案申请 视图数据详情") public class LoanCaseCloseApplyDetailsVo implements Vo { @@ -66,77 +52,77 @@ public class LoanCaseCloseApplyDetailsVo implements Vo { private Date createTime; @ApiModelProperty("创建人sid") private String createBySid; - @ApiModelProperty("创建人") + @ApiModelProperty("创建人") private String createByName; // 创建人 - @ApiModelProperty("申请编号") + @ApiModelProperty("申请编号") private String billNo; // 申请编号 - @ApiModelProperty("申请部门sid") + @ApiModelProperty("申请部门sid") private String deptSid; // 申请部门sid - @ApiModelProperty("申请部门名称") + @ApiModelProperty("申请部门名称") private String deptName; // 申请部门名称 - @ApiModelProperty("案件创建日期") + @ApiModelProperty("案件创建日期") private String caseCreateDate; // 案件创建日期 - @ApiModelProperty("公司负责人") + @ApiModelProperty("公司负责人") private String compHead; // 公司负责人 - @ApiModelProperty("法务部门负责人") + @ApiModelProperty("法务部门负责人") private String legalDeptHead; // 法务部门负责人 - @ApiModelProperty("案件编号") + @ApiModelProperty("案件编号") private String caseNo; // 案件编号 - @ApiModelProperty("案件类型") + @ApiModelProperty("案件类型") private String caseType; // 案件类型 - @ApiModelProperty("贷款合同编号") + @ApiModelProperty("贷款合同编号") private String loanContract; // 贷款合同编号 - @ApiModelProperty("贷款人") + @ApiModelProperty("贷款人") private String lenderName; // 贷款人 - @ApiModelProperty("贷款人证件号码") + @ApiModelProperty("贷款人证件号码") private String lenderIdNo; // 贷款人证件号码 - @ApiModelProperty("贷款人户籍/注册地址") + @ApiModelProperty("贷款人户籍/注册地址") private String lenderAddress; // 贷款人户籍/注册地址 - @ApiModelProperty("客户") + @ApiModelProperty("客户") private String customName; // 客户 - @ApiModelProperty("资方") + @ApiModelProperty("资方") private String bankName; // 资方 - @ApiModelProperty("资方合同编号") + @ApiModelProperty("资方合同编号") private String bankContract; // 资方合同编号 - @ApiModelProperty("欠款合计") + @ApiModelProperty("欠款合计") private String arrearsTotal; // 欠款合计 - @ApiModelProperty("是否全额诉讼") + @ApiModelProperty("是否全额诉讼") private String isFullLitigation; // 是否全额诉讼 - @ApiModelProperty("起诉金额合计") + @ApiModelProperty("起诉金额合计") private String sueMoneyTotal; // 起诉金额合计 - @ApiModelProperty("部分诉讼说明") + @ApiModelProperty("部分诉讼说明") private String partProceRemarks; // 部分诉讼说明 - @ApiModelProperty("最终判决金额") + @ApiModelProperty("最终判决金额") private String finalJudgMoney; // 最终判决金额 - @ApiModelProperty("回款金额") + @ApiModelProperty("回款金额") private String returnMoney; // 回款金额 - @ApiModelProperty("未回款金额") + @ApiModelProperty("未回款金额") private String notReturnMoney; // 未回款金额 - @ApiModelProperty("结案方式key") + @ApiModelProperty("结案方式key") private String closeTypeKey; // 结案方式key - @ApiModelProperty("结案方式value") + @ApiModelProperty("结案方式value") private String closeTypeValue; // 结案方式value - @ApiModelProperty("结案日期") + @ApiModelProperty("结案日期") private String closeDate; // 结案日期 - @ApiModelProperty("结案说明") + @ApiModelProperty("结案说明") private String closeRemarks; // 结案说明 @ApiModelProperty("案件进程sid") private String busSid; - @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 @ApiModelProperty diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDto.java index 64f10be255..df3ce9803d 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDto.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loancasecloseapply; - import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehDto; import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteFile; import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDto; @@ -37,19 +36,6 @@ import lombok.Data; import java.util.List; -/** - * Project: anrui-riskcenter(案件结案申请)
- * File: LoanCaseCloseApplyDto.java
- * Class: com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseApplyDto
- * Description: 案件结案申请 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-02-08 11:07:38
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "案件结案申请 数据传输对象", description = "案件结案申请 数据传输对象") public class LoanCaseCloseApplyDto implements Dto { @@ -60,81 +46,81 @@ public class LoanCaseCloseApplyDto implements Dto { private String remarks; @ApiModelProperty("创建人sid") private String createBySid; - @ApiModelProperty("创建人") + @ApiModelProperty("创建人") private String createByName; // 创建人 - @ApiModelProperty("申请编号") + @ApiModelProperty("申请编号") private String billNo; // 申请编号 - @ApiModelProperty("申请部门sid") + @ApiModelProperty("申请部门sid") private String deptSid; // 申请部门sid - @ApiModelProperty("申请部门名称") + @ApiModelProperty("申请部门名称") private String deptName; // 申请部门名称 - @ApiModelProperty("案件创建日期") + @ApiModelProperty("案件创建日期") private String caseCreateDate; // 案件创建日期 - @ApiModelProperty("公司负责人") + @ApiModelProperty("公司负责人") private String compHead; // 公司负责人 - @ApiModelProperty("法务部门负责人") + @ApiModelProperty("法务部门负责人") private String legalDeptHead; // 法务部门负责人 - @ApiModelProperty("案件编号") + @ApiModelProperty("案件编号") private String caseNo; // 案件编号 - @ApiModelProperty("案件类型") + @ApiModelProperty("案件类型") private String caseType; // 案件类型 - @ApiModelProperty("贷款合同编号") + @ApiModelProperty("贷款合同编号") private String loanContract; // 贷款合同编号 - @ApiModelProperty("贷款人") + @ApiModelProperty("贷款人") private String lenderName; // 贷款人 - @ApiModelProperty("贷款人证件号码") + @ApiModelProperty("贷款人证件号码") private String lenderIdNo; // 贷款人证件号码 - @ApiModelProperty("贷款人户籍/注册地址") + @ApiModelProperty("贷款人户籍/注册地址") private String lenderAddress; // 贷款人户籍/注册地址 - @ApiModelProperty("客户") + @ApiModelProperty("客户") private String customName; // 客户 - @ApiModelProperty("资方") + @ApiModelProperty("资方") private String bankName; // 资方 - @ApiModelProperty("资方合同编号") + @ApiModelProperty("资方合同编号") private String bankContract; // 资方合同编号 - @ApiModelProperty("欠款合计") + @ApiModelProperty("欠款合计") private String arrearsTotal; // 欠款合计 - @ApiModelProperty("是否全额诉讼") + @ApiModelProperty("是否全额诉讼") private String isFullLitigation; // 是否全额诉讼 - @ApiModelProperty("起诉金额合计") + @ApiModelProperty("起诉金额合计") private String sueMoneyTotal; // 起诉金额合计 - @ApiModelProperty("部分诉讼说明") + @ApiModelProperty("部分诉讼说明") private String partProceRemarks; // 部分诉讼说明 - @ApiModelProperty("最终判决金额") + @ApiModelProperty("最终判决金额") private String finalJudgMoney; // 最终判决金额 - @ApiModelProperty("回款金额") + @ApiModelProperty("回款金额") private String returnMoney; // 回款金额 - @ApiModelProperty("未回款金额") + @ApiModelProperty("未回款金额") private String notReturnMoney; // 未回款金额 - @ApiModelProperty("执行措施") + @ApiModelProperty("执行措施") private String executeMeasure; // 执行措施 - @ApiModelProperty("执行说明") + @ApiModelProperty("执行说明") private String executeRemarks; // 执行说明 - @ApiModelProperty("结案方式key") + @ApiModelProperty("结案方式key") private String closeTypeKey; // 结案方式key - @ApiModelProperty("结案方式value") + @ApiModelProperty("结案方式value") private String closeTypeValue; // 结案方式value - @ApiModelProperty("结案日期") + @ApiModelProperty("结案日期") private String closeDate; // 结案日期 - @ApiModelProperty("结案说明") + @ApiModelProperty("结案说明") private String closeRemarks; // 结案说明 @ApiModelProperty("案件进程sid") private String busSid; - @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 @ApiModelProperty diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyFeign.java index 29f0dbb490..baa35686e5 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyFeign.java @@ -70,12 +70,12 @@ public interface LoanCaseCloseApplyFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody LoanCaseCloseApplyDto 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/loancasecloseveh/LoanCaseCloseVeh.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVeh.java index 794ce24ce2..f14e7e17fa 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVeh.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVeh.java @@ -31,34 +31,22 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: anrui-riskcenter(案件结案申请)
- * File: LoanCaseCloseVeh.java
- * Class: com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVeh
- * Description: 案件结案车辆.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-02-08 11:07:38
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "案件结案车辆", description = "案件结案车辆") @TableName("loan_case_close_veh") public class LoanCaseCloseVeh extends BaseEntity { - private static final long serialVersionUID = 1L; - @ApiModelProperty("车架号") + @ApiModelProperty("销售订单车辆sid") + private String busVinSid; + @ApiModelProperty("车架号") private String vinNo; // 车架号 - @ApiModelProperty("车牌号") + @ApiModelProperty("车牌号") private String carNum; // 车牌号 - @ApiModelProperty("挂靠公司") + @ApiModelProperty("挂靠公司") private String affiliatedCompany; // 挂靠公司 - @ApiModelProperty("车辆状态") + @ApiModelProperty("车辆状态") private String carState; // 车辆状态 - @ApiModelProperty("案件结案申请sid") + @ApiModelProperty("案件结案申请sid") private String mainSid; // 案件结案申请sid } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVehDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVehDetailsVo.java index 0219c9631a..3594284247 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVehDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVehDetailsVo.java @@ -25,43 +25,31 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loancasecloseveh; - import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: anrui-riskcenter(案件结案申请)
- * File: LoanCaseCloseVehVo.java
- * Class: com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehVo
- * Description: 案件结案车辆 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-02-08 11:07:38
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "案件结案车辆 视图数据详情", description = "案件结案车辆 视图数据详情") public class LoanCaseCloseVehDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("车架号") + @ApiModelProperty("销售订单车辆sid") + private String busVinSid; + @ApiModelProperty("车架号") private String vinNo; // 车架号 - @ApiModelProperty("车牌号") + @ApiModelProperty("车牌号") private String carNum; // 车牌号 - @ApiModelProperty("挂靠公司") + @ApiModelProperty("挂靠公司") private String affiliatedCompany; // 挂靠公司 - @ApiModelProperty("车辆状态") + @ApiModelProperty("车辆状态") private String carState; // 车辆状态 @ApiModelProperty("备注") private String remarks; - @ApiModelProperty("案件结案申请sid") + @ApiModelProperty("案件结案申请sid") private String mainSid; // 案件结案申请sid } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVehDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVehDto.java index 1cdd5f25b4..d69d5b32a2 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVehDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVehDto.java @@ -25,41 +25,29 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loancasecloseveh; - import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: anrui-riskcenter(案件结案申请)
- * File: LoanCaseCloseVehDto.java
- * Class: com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehDto
- * Description: 案件结案车辆 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-02-08 11:07:38
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "案件结案车辆 数据传输对象", description = "案件结案车辆 数据传输对象") public class LoanCaseCloseVehDto implements Dto { private String sid; // sid - @ApiModelProperty("车架号") + @ApiModelProperty("销售订单车辆sid") + private String busVinSid; + @ApiModelProperty("车架号") private String vinNo; // 车架号 - @ApiModelProperty("车牌号") + @ApiModelProperty("车牌号") private String carNum; // 车牌号 - @ApiModelProperty("挂靠公司") + @ApiModelProperty("挂靠公司") private String affiliatedCompany; // 挂靠公司 - @ApiModelProperty("车辆状态") + @ApiModelProperty("车辆状态") private String carState; // 车辆状态 - @ApiModelProperty("案件结案申请sid") + @ApiModelProperty("案件结案申请sid") private String mainSid; // 案件结案申请sid } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVehFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVehFeign.java deleted file mode 100644 index e7724a209d..0000000000 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVehFeign.java +++ /dev/null @@ -1,78 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.anrui.riskcenter.api.loancasecloseveh; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -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: LoanCaseCloseVehFeign.java
- * Class: com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehFeign
- * Description: 案件结案车辆.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-02-08 11:07:38
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Api(tags = "案件结案车辆") -@FeignClient( - contextId = "anrui-riskcenter-LoanCaseCloseVeh", - name = "anrui-riskcenter", - path = "v1/loancasecloseveh", - fallback = LoanCaseCloseVehFeignFallback.class) -public interface LoanCaseCloseVehFeign { - - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - @ResponseBody - public ResultBean> listPage(@RequestBody PagerQuery pq); - - @ApiOperation("新增或修改") - @PostMapping("/save") - @ResponseBody - public ResultBean save(@RequestBody LoanCaseCloseVehDto dto); - - @ApiOperation("根据sid删除记录") - @DeleteMapping("/delBySids") - @ResponseBody - public ResultBean delBySids(@RequestBody String[] sids); - - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - @ResponseBody - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); -} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVehFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVehFeignFallback.java deleted file mode 100644 index 1839772e25..0000000000 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVehFeignFallback.java +++ /dev/null @@ -1,72 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.anrui.riskcenter.api.loancasecloseveh; - -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: LoanCaseCloseVehFeignFallback.java
- * Class: com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehFeignFallback
- * Description: 案件结案车辆.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-02-08 11:07:38
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Component -public class LoanCaseCloseVehFeignFallback implements LoanCaseCloseVehFeign { - - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-riskcenter/loancasecloseveh/listPage无法访问"); - } - - @Override - public ResultBean save(LoanCaseCloseVehDto dto){ - return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loancasecloseveh/save无法访问"); - } - - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loancasecloseveh/delBySids无法访问"); - } - - @Override - public ResultBean fetchDetailsBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-riskcenter/loancasecloseveh/fetchDetailsBySid无法访问"); - } -} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVehQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVehQuery.java deleted file mode 100644 index 57f1573803..0000000000 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVehQuery.java +++ /dev/null @@ -1,63 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.anrui.riskcenter.api.loancasecloseveh; - - -import com.yxt.common.core.query.Query; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: anrui-riskcenter(案件结案申请)
- * File: LoanCaseCloseVehQuery.java
- * Class: com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehQuery
- * Description: 案件结案车辆 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-02-08 11:07:38
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "案件结案车辆 查询条件", description = "案件结案车辆 查询条件") -public class LoanCaseCloseVehQuery implements Query { - - @ApiModelProperty("车架号") - private String vinNo; // 车架号 - @ApiModelProperty("车牌号") - private String carNum; // 车牌号 - @ApiModelProperty("挂靠公司") - private String affiliatedCompany; // 挂靠公司 - @ApiModelProperty("车辆状态") - private String carState; // 车辆状态 - @ApiModelProperty("案件结案申请sid") - private String mainSid; // 案件结案申请sid - -} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVehVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVehVo.java deleted file mode 100644 index 7f3c499430..0000000000 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseveh/LoanCaseCloseVehVo.java +++ /dev/null @@ -1,65 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.anrui.riskcenter.api.loancasecloseveh; - - -import com.yxt.common.core.vo.Vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: anrui-riskcenter(案件结案申请)
- * File: LoanCaseCloseVehVo.java
- * Class: com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehVo
- * Description: 案件结案车辆 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-02-08 11:07:38
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "案件结案车辆 视图数据对象", description = "案件结案车辆 视图数据对象") -public class LoanCaseCloseVehVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("车架号") - private String vinNo; // 车架号 - @ApiModelProperty("车牌号") - private String carNum; // 车牌号 - @ApiModelProperty("挂靠公司") - private String affiliatedCompany; // 挂靠公司 - @ApiModelProperty("车辆状态") - private String carState; // 车辆状态 - @ApiModelProperty("案件结案申请sid") - private String mainSid; // 案件结案申请sid - -} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyRest.java index 7880f43ae6..ce6fb298a6 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyRest.java @@ -38,113 +38,100 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseApply; + import com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseApplyQuery; import com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseApplyVo; import com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseApplyDetailsVo; import com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseApplyDto; import com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseApplyFeign; -/** - * Project: anrui-riskcenter(案件结案申请)
- * File: LoanCaseCloseApplyFeignFallback.java
- * Class: com.yxt.anrui.riskcenter.biz.loancasecloseapply.LoanCaseCloseApplyRest
- * Description: 案件结案申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-02-08 11:07:38
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "案件结案申请") -@RestController("com.yxt.anrui.riskcenter.biz.loancasecloseapply.LoanCaseCloseApplyRest") +@RestController @RequestMapping("v1/loancasecloseapply") public class LoanCaseCloseApplyRest implements LoanCaseCloseApplyFeign { - @Autowired - private LoanCaseCloseApplyService loanCaseCloseApplyService; - - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = loanCaseCloseApplyService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody LoanCaseCloseApplyDto dto){ - ResultBean rb = ResultBean.fireFail(); - loanCaseCloseApplyService.saveOrUpdateDto(dto); - return rb.success(); - } - - @Override - @ApiOperation("根据sid批量删除") + @Autowired + private LoanCaseCloseApplyService loanCaseCloseApplyService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = loanCaseCloseApplyService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody LoanCaseCloseApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + loanCaseCloseApplyService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - return loanCaseCloseApplyService.delAll(sids); - } + public ResultBean delBySids(@RequestBody String[] sids) { + return loanCaseCloseApplyService.delAll(sids); + } - @Override - @ApiOperation("根据SID获取一条记录") + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - LoanCaseCloseApplyDetailsVo vo = loanCaseCloseApplyService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } - - @Override - public ResultBean details(String sid, String userSid, String orgPath) { - return loanCaseCloseApplyService.details(sid,userSid,orgPath); - } - - @Override - public ResultBean submit(SubmitLoanCaseCloseApplyDto dto) { - return loanCaseCloseApplyService.submit(dto); - } - - @Override - public ResultBean complete(LoanCaseCloseApplyCompleteDto query) { - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.LOANCASECLOSEAPPLY.getProDefId()); - return loanCaseCloseApplyService.complete(bv); - } - - @Override - public ResultBean> getPreviousNodesForReject(LoanCaseCloseApplyNodeQuery query) { - return loanCaseCloseApplyService.getPreviousNodesForReject(query); - } - - @Override - public ResultBean> getNextNodesForSubmit(LoanCaseCloseApplyNodeQuery query) { - return loanCaseCloseApplyService.getNextNodesForSubmit(query); - } - - @Override - public ResultBean reject(LoanCaseCloseApplyTaskQuery query) { - return loanCaseCloseApplyService.reject(query); - } - - @Override - public ResultBean revokeProcess(LoanCaseCloseApplyTaskQuery query) { - return loanCaseCloseApplyService.revokeProcess(query); - } - - @Override - public ResultBean breakProcess(LoanCaseCloseApplyTaskQuery query) { - return loanCaseCloseApplyService.breakProcess(query); - } - - @Override - public ResultBean delegate(LoanCaseCloseApplyDelegateQuery query) { - return loanCaseCloseApplyService.delegate(query); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanCaseCloseApplyDetailsVo vo = loanCaseCloseApplyService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + + @Override + public ResultBean details(String sid, String userSid, String orgPath) { + return loanCaseCloseApplyService.details(sid, userSid, orgPath); + } + + @Override + public ResultBean submit(SubmitLoanCaseCloseApplyDto dto) { + return loanCaseCloseApplyService.submit(dto); + } + + @Override + public ResultBean complete(LoanCaseCloseApplyCompleteDto query) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(ProcDefEnum.LOANCASECLOSEAPPLY.getProDefId()); + return loanCaseCloseApplyService.complete(bv); + } + + @Override + public ResultBean> getPreviousNodesForReject(LoanCaseCloseApplyNodeQuery query) { + return loanCaseCloseApplyService.getPreviousNodesForReject(query); + } + + @Override + public ResultBean> getNextNodesForSubmit(LoanCaseCloseApplyNodeQuery query) { + return loanCaseCloseApplyService.getNextNodesForSubmit(query); + } + + @Override + public ResultBean reject(LoanCaseCloseApplyTaskQuery query) { + return loanCaseCloseApplyService.reject(query); + } + + @Override + public ResultBean revokeProcess(LoanCaseCloseApplyTaskQuery query) { + return loanCaseCloseApplyService.revokeProcess(query); + } + + @Override + public ResultBean breakProcess(LoanCaseCloseApplyTaskQuery query) { + return loanCaseCloseApplyService.breakProcess(query); + } + + @Override + public ResultBean delegate(LoanCaseCloseApplyDelegateQuery query) { + return loanCaseCloseApplyService.delegate(query); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java index ba564739f0..ae6126e014 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java @@ -42,6 +42,10 @@ import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFe import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVinStateSetQuery; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRFeign; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer; import com.yxt.anrui.fin.api.kingdee.voucher.Voucher; @@ -61,6 +65,7 @@ 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.loanbepadsincereveh.LoanBePadsincereVehDetailsVo; import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealApply; import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.LoanCaseAppealApplyNodeVo; import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.SubmitLoanCaseAppealApplyDto; @@ -80,9 +85,14 @@ import com.yxt.anrui.riskcenter.api.loancaseprogresstrial.LoanCaseProgressTrial; import com.yxt.anrui.riskcenter.api.loancaseprogressveh.LoanCaseProgressVeh; import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; +import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory; +import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply; import com.yxt.anrui.riskcenter.api.loanrepurchasecost.LoanRepurchaseCost; import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo; +import com.yxt.anrui.riskcenter.api.loansecondarysalesnotapply.LoanSecondarySalesNotApply; +import com.yxt.anrui.riskcenter.api.loansecondarysalesnotveh.LoanSecondarySalesNotVehDetailsVo; +import com.yxt.anrui.riskcenter.biz.loanbepadsincereveh.LoanBePadsincereVehService; import com.yxt.anrui.riskcenter.biz.loancasecloseveh.LoanCaseCloseVehService; import com.yxt.anrui.riskcenter.biz.loancaseexecuteveh.LoanCaseExecuteVehService; import com.yxt.anrui.riskcenter.biz.loancaseprogress.LoanCaseProgressService; @@ -91,6 +101,7 @@ import com.yxt.anrui.riskcenter.biz.loancaseprogressexecutemeasure.LoanCaseProgr import com.yxt.anrui.riskcenter.biz.loancaseprogresstrial.LoanCaseProgressTrialService; import com.yxt.anrui.riskcenter.biz.loancaseprogressveh.LoanCaseProgressVehService; import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; +import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService; import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService; import com.yxt.anrui.riskcenter.biz.loanrepurchaseapply.LoanRepurchaseApplyService; import com.yxt.anrui.riskcenter.biz.loanrepurchasecost.LoanRepurchaseCostService; @@ -115,19 +126,6 @@ import java.util.*; import java.util.concurrent.*; import java.util.stream.Collectors; -/** - * Project: anrui-riskcenter(案件结案申请)
- * File: LoanCaseCloseApplyService.java
- * Class: com.yxt.anrui.riskcenter.biz.loancasecloseapply.LoanCaseCloseApplyService
- * Description: 案件结案申请 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-02-08 11:07:38
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class LoanCaseCloseApplyService extends MybatisBaseService { @@ -161,7 +159,6 @@ public class LoanCaseCloseApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { LoanCaseCloseApplyQuery query = pq.getParams(); @@ -509,6 +514,8 @@ public class LoanCaseCloseApplyService extends MybatisBaseService loanCaseCloseVehDetailsVos = loanCaseCloseVehService.selByMainSid(businessSid); + for (LoanCaseCloseVehDetailsVo loanCaseCloseVehDetailsVo : loanCaseCloseVehDetailsVos) { + //查询车辆还款计划明细 + List loanRepaymentPlanDetails = loanRepaymentPlanDetailsService.selectByBusVinSid(loanCaseCloseVehDetailsVo.getBusVinSid()); + //查询车辆是否有垫款金额 + List loanBePadsincereVehDetailsVos = loanBePadsincereVehService.selByBusVinSid(loanCaseCloseVehDetailsVo.getBusVinSid()); + //获取明细sid集合 + List jhmxSids = loanRepaymentPlanDetails.stream().map(c -> c.getSid()). + collect(Collectors.toList()); + //查询金融应收所有应收款 + List data = finUncollectedReceivablesDetailedJRFeign.selByBusSid(jhmxSids).getData(); + if (!data.isEmpty()) { + for (FinUncollectedReceivablesDetailedJR datum : data) { + List finSelectedReceivablesDetaileds = finSelectedReceivablesDetailedFeign.fetchByReceivablesSid(datum.getSid()).getData(); + if (finSelectedReceivablesDetaileds.isEmpty()) { + List selectList = new ArrayList<>(); + FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed(); + fin.setCreateBySid(loanCaseCloseApply.getCreateBySid()); + fin.setRemarks("认损"); + fin.setVIN(loanCaseCloseVehDetailsVo.getVinNo()); + fin.setUseOrgSid(loanCaseCloseApply.getUseOrgSid()); + fin.setReceivablesName(datum.getPayCostTitleValue()); + fin.setSubscriptionMoney(datum.getReveivableMoney()); + fin.setSubscriptionDate(DateUtil.today()); + fin.setAuditState(3); + fin.setAuditDate(DateUtil.today()); + fin.setReceivablesSid(datum.getSid()); + fin.setKxState("01"); + fin.setPurchaseSystemSid(""); + fin.setPurchaseSystemName(""); + fin.setStaffUserSid(""); + fin.setUseOrgName(loanCaseCloseApply.getUseOrgName()); + fin.setOrgSidPath(sysOrganizationVo.getOrgSidPath()); + selectList.add(fin); + finSelectedReceivablesDetailedFeign.saveAll(selectList); + } else { + BigDecimal ys = finSelectedReceivablesDetaileds.stream().map(FinSelectedReceivablesDetailed::getSubscriptionMoney).reduce(BigDecimal.ZERO, BigDecimal::add); + if (ys.compareTo(datum.getReveivableMoney()) == -1) { + List selectList = new ArrayList<>(); + FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed(); + fin.setCreateBySid(loanCaseCloseApply.getCreateBySid()); + fin.setRemarks("认损"); + fin.setVIN(loanCaseCloseVehDetailsVo.getVinNo()); + fin.setUseOrgSid(loanCaseCloseApply.getUseOrgSid()); + fin.setReceivablesName(datum.getPayCostTitleValue()); + fin.setSubscriptionMoney(datum.getReveivableMoney().subtract(ys)); + fin.setSubscriptionDate(DateUtil.today()); + fin.setAuditState(3); + fin.setAuditDate(DateUtil.today()); + fin.setReceivablesSid(datum.getSid()); + fin.setKxState("01"); + fin.setPurchaseSystemSid(""); + fin.setPurchaseSystemName(""); + fin.setStaffUserSid(""); + fin.setUseOrgName(loanCaseCloseApply.getUseOrgName()); + fin.setOrgSidPath(sysOrganizationVo.getOrgSidPath()); + selectList.add(fin); + finSelectedReceivablesDetailedFeign.saveAll(selectList); + } + } + } + } + //月还 + List loanRepaymentHistories = loanRepaymentHistoryService.selHistoryByPlanSids(jhmxSids); + if (loanRepaymentHistories.isEmpty()) { + for (LoanRepaymentPlanDetails plan : loanRepaymentPlanDetails) { + List histories = new ArrayList<>(); + LoanRepaymentHistory history = new LoanRepaymentHistory(); + history.setCreateBySid(loanCaseCloseApply.getCreateBySid()); + history.setDataTime(new Date()); + history.setUpdateState("1"); + history.setUpdateTime(new Date()); + history.setActualDate(plan.getDueDate()); + history.setActualMoney(plan.getDueMoney()); + history.setBuckleKey("003"); + history.setBuckle("审核通过"); + history.setReturnWayKey(""); + history.setReturnWay(""); + history.setPayState(0); + history.setIsEnable(3); + history.setPlanDetailSid(plan.getSid()); + history.setScheduleSid(""); + history.setRemarks("认损"); + histories.add(history); + loanRepaymentHistoryService.saveList(histories); + } + } else { + for (LoanRepaymentPlanDetails plan : loanRepaymentPlanDetails) { + List loanRepaymentHistories1 = loanRepaymentHistoryService.selHistoryByPlanSid(plan.getSid()); + BigDecimal sh = loanRepaymentHistories1.stream().map(LoanRepaymentHistory::getActualMoney).reduce(BigDecimal.ZERO, BigDecimal::add); + if (!loanBePadsincereVehDetailsVos.isEmpty()) { + List periods = loanBePadsincereVehDetailsVos.stream().map(v -> v.getPeriod()).collect(Collectors.toList()); + if (periods.contains(plan.getPeriod())) { + for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVos) { + if (plan.getPeriod().equals(loanBePadsincereVehDetailsVo.getPeriod())) { + sh = sh.subtract(new BigDecimal(loanBePadsincereVehDetailsVo.getPadMoney())); + if (sh.compareTo(plan.getDueMoney()) == -1) { + List histories = new ArrayList<>(); + LoanRepaymentHistory history = new LoanRepaymentHistory(); + history.setCreateBySid(loanCaseCloseApply.getCreateBySid()); + history.setDataTime(new Date()); + history.setUpdateState("1"); + history.setUpdateTime(new Date()); + history.setActualDate(plan.getDueDate()); + history.setActualMoney(plan.getDueMoney().subtract(sh)); + history.setBuckleKey("003"); + history.setBuckle("审核通过"); + history.setReturnWayKey(""); + history.setReturnWay(""); + history.setPayState(0); + history.setIsEnable(3); + history.setPlanDetailSid(plan.getSid()); + history.setScheduleSid(""); + history.setRemarks("认损"); + histories.add(history); + loanRepaymentHistoryService.saveList(histories); + } + } + } + } else { + if (sh.compareTo(plan.getDueMoney()) == -1) { + List histories = new ArrayList<>(); + LoanRepaymentHistory history = new LoanRepaymentHistory(); + history.setCreateBySid(loanCaseCloseApply.getCreateBySid()); + history.setDataTime(new Date()); + history.setUpdateState("1"); + history.setUpdateTime(new Date()); + history.setActualDate(plan.getDueDate()); + history.setActualMoney(plan.getDueMoney().subtract(sh)); + history.setBuckleKey("003"); + history.setBuckle("审核通过"); + history.setReturnWayKey(""); + history.setReturnWay(""); + history.setPayState(0); + history.setIsEnable(3); + history.setPlanDetailSid(plan.getSid()); + history.setScheduleSid(""); + history.setRemarks("认损"); + histories.add(history); + loanRepaymentHistoryService.saveList(histories); + } + } + }else { + if (sh.compareTo(plan.getDueMoney()) == -1) { + List histories = new ArrayList<>(); + LoanRepaymentHistory history = new LoanRepaymentHistory(); + history.setCreateBySid(loanCaseCloseApply.getCreateBySid()); + history.setDataTime(new Date()); + history.setUpdateState("1"); + history.setUpdateTime(new Date()); + history.setActualDate(plan.getDueDate()); + history.setActualMoney(plan.getDueMoney().subtract(sh)); + history.setBuckleKey("003"); + history.setBuckle("审核通过"); + history.setReturnWayKey(""); + history.setReturnWay(""); + history.setPayState(0); + history.setIsEnable(3); + history.setPlanDetailSid(plan.getSid()); + history.setScheduleSid(""); + history.setRemarks("认损"); + histories.add(history); + loanRepaymentHistoryService.saveList(histories); + } + } + } + } + } + } + public void pushRiskToFin(String sid){ LoanCaseCloseApply loanCaseCloseApply = fetchBySid(sid); if(loanCaseCloseApply != null){ @@ -1135,6 +1316,7 @@ public class LoanCaseCloseApplyService extends MybatisBaseService loanCaseProgressVehs = loanCaseProgressVehService.selByMainSid(sid); for (LoanCaseProgressVeh loanCaseProgressVeh : loanCaseProgressVehs) { LoanCaseCloseVehDetailsVo loanCaseCloseVehDetailsVo = new LoanCaseCloseVehDetailsVo(); + loanCaseCloseVehDetailsVo.setBusVinSid(loanCaseProgressVeh.getBusVinSid()); loanCaseCloseVehDetailsVo.setVinNo(loanCaseProgressVeh.getVinNo()); loanCaseCloseVehDetailsVo.setCarNum(loanCaseProgressVeh.getVehMark()); loanCaseCloseVehDetailsVo.setAffiliatedCompany(loanCaseProgressVeh.getAffiliatedCompany()); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseveh/LoanCaseCloseVehMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseveh/LoanCaseCloseVehMapper.java index be46b5a627..998f82c3db 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseveh/LoanCaseCloseVehMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseveh/LoanCaseCloseVehMapper.java @@ -25,49 +25,21 @@ *********************************************************/ package com.yxt.anrui.riskcenter.biz.loancasecloseveh; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehDetailsVo; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVeh; -import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehVo; import java.util.List; -/** - * Project: anrui-riskcenter(案件结案申请)
- * File: LoanCaseCloseVehMapper.java
- * Class: com.yxt.anrui.riskcenter.biz.loancasecloseveh.LoanCaseCloseVehMapper
- * Description: 案件结案车辆.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-02-08 11:07:38
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Mapper public interface LoanCaseCloseVehMapper extends BaseMapper { - //@Update("update loan_case_close_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_case_close_veh") - List selectListVo(); - - @Delete("delete from loan_case_close_veh where mainSid = #{dtoSid}") + @Delete("delete from loan_case_close_veh where mainSid = #{dtoSid}") void delByMainSid(String dtoSid); - @Select("select * from loan_case_close_veh where mainSid = #{sid}") - List selByMainSid(String sid); + @Select("select * from loan_case_close_veh where mainSid = #{sid}") + List selByMainSid(String sid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseveh/LoanCaseCloseVehMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseveh/LoanCaseCloseVehMapper.xml index 17ede10159..0b48afdb78 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseveh/LoanCaseCloseVehMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseveh/LoanCaseCloseVehMapper.xml @@ -3,11 +3,4 @@ - - - \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseveh/LoanCaseCloseVehRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseveh/LoanCaseCloseVehRest.java index 6f4f1c3931..250f091c1f 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseveh/LoanCaseCloseVehRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseveh/LoanCaseCloseVehRest.java @@ -25,76 +25,12 @@ *********************************************************/ package com.yxt.anrui.riskcenter.biz.loancasecloseveh; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; -import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVeh; -import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehQuery; -import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehVo; -import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehDetailsVo; -import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehDto; -import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehFeign; - -/** - * Project: anrui-riskcenter(案件结案申请)
- * File: LoanCaseCloseVehFeignFallback.java
- * Class: com.yxt.anrui.riskcenter.biz.loancasecloseveh.LoanCaseCloseVehRest
- * Description: 案件结案车辆.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-02-08 11:07:38
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "案件结案车辆") -@RestController("com.yxt.anrui.riskcenter.biz.loancasecloseveh.LoanCaseCloseVehRest") +@RestController @RequestMapping("v1/loancasecloseveh") -public class LoanCaseCloseVehRest implements LoanCaseCloseVehFeign { - - @Autowired - private LoanCaseCloseVehService loanCaseCloseVehService; - - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = loanCaseCloseVehService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody LoanCaseCloseVehDto dto){ - ResultBean rb = ResultBean.fireFail(); - loanCaseCloseVehService.saveOrUpdateDto(dto); - return rb.success(); - } - - @Override - @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - loanCaseCloseVehService.delBySids(sids); - return rb.success(); - } +public class LoanCaseCloseVehRest { - @Override - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - LoanCaseCloseVehDetailsVo vo = loanCaseCloseVehService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseveh/LoanCaseCloseVehService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseveh/LoanCaseCloseVehService.java index 871a6eb26f..46afa111fd 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseveh/LoanCaseCloseVehService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseveh/LoanCaseCloseVehService.java @@ -32,87 +32,48 @@ import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVeh; -import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehQuery; -import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehVo; import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehDetailsVo; import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehDto; -import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehFeign; import org.springframework.stereotype.Service; import java.util.List; -/** - * Project: anrui-riskcenter(案件结案申请)
- * File: LoanCaseCloseVehService.java
- * Class: com.yxt.anrui.riskcenter.biz.loancasecloseveh.LoanCaseCloseVehService
- * Description: 案件结案车辆 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-02-08 11:07:38
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class LoanCaseCloseVehService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(LoanCaseCloseVehQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - LoanCaseCloseVehQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(LoanCaseCloseVehDto dto){ + + public void saveOrUpdateDto(LoanCaseCloseVehDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(LoanCaseCloseVehDto dto){ - LoanCaseCloseVeh entity = new LoanCaseCloseVeh(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(LoanCaseCloseVehDto dto){ - String dtoSid = dto.getSid(); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(LoanCaseCloseVehDto dto) { + LoanCaseCloseVeh entity = new LoanCaseCloseVeh(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(LoanCaseCloseVehDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - LoanCaseCloseVeh entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public LoanCaseCloseVehDetailsVo fetchDetailsVoBySid(String sid){ - LoanCaseCloseVeh entity = fetchBySid(sid); - LoanCaseCloseVehDetailsVo vo = new LoanCaseCloseVehDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + } + LoanCaseCloseVeh entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } - public void delByMainSid(String dtoSid) { - baseMapper.delByMainSid(dtoSid); - } + public void delByMainSid(String dtoSid) { + baseMapper.delByMainSid(dtoSid); + } - public List selByMainSid(String sid) { - return baseMapper.selByMainSid(sid); - } + public List selByMainSid(String sid) { + return baseMapper.selByMainSid(sid); + } } \ No newline at end of file