From 57621144ae9287f854f596b71b5f42f4651a7c97 Mon Sep 17 00:00:00 2001 From: ligaode Date: Wed, 16 Apr 2025 10:22:12 +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 --- .../api/basevehicle/PayBaseVehicleVo.java | 2 - .../biz/basevehicle/BaseVehicleService.java | 21 ++--- .../LoanRestoreReportApplyDetailsVo.java | 86 ++++++++----------- .../LoanRestoreReportApplyDto.java | 84 ++++++++---------- .../LoanBeCollectionRecordRest.java | 15 +--- .../LoanRestoreReportApplyMapper.java | 48 ++++------- .../LoanRestoreReportApplyRest.java | 17 +--- 7 files changed, 93 insertions(+), 180 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java index 707c3324db..3ad1e34f72 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java @@ -52,8 +52,6 @@ public class PayBaseVehicleVo implements Vo { private String saleTypeValue; @ApiModelProperty("买断状态") private String settlementStatusValue; - @ApiModelProperty("交清状态") - private String finState; @ApiModelProperty(value = "品牌") private String brandName; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 9705ebf140..50b4692335 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -3546,6 +3546,11 @@ public class BaseVehicleService extends MybatisBaseService wrapper.isNull("vs.finState").or().eq("vs.finState", 0)); + } if (StringUtils.isNotBlank(query.getVinNo())) { qw.like("bv.vinNo", query.getVinNo()); } @@ -3603,22 +3608,6 @@ public class BaseVehicleService extends MybatisBaseService pagging = baseMapper.selectPayVehicleList(page, qw); - Iterator iterator = pagging.getRecords().iterator(); - if (query.getIsSettle().equals("0")) { - while (iterator.hasNext()) { - PayBaseVehicleVo next = iterator.next(); - if ("1".equals(next.getFinState())) { - pagging.getRecords().remove(next); - } - } - } else if (query.getIsSettle().equals("1")) { - while (iterator.hasNext()) { - PayBaseVehicleVo next = iterator.next(); - if (StringUtils.isBlank(next.getFinState()) || "0".equals(next.getFinState())) { - pagging.getRecords().remove(next); - } - } - } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDetailsVo.java index 37f3d68aa0..78be4822e3 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDetailsVo.java @@ -25,29 +25,13 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loanrestorereportapply; - import com.yxt.common.core.vo.Vo; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.util.ArrayList; import java.util.List; -/** - * Project: anrui-riskcenter(车辆交回事前报备申请)
- * File: LoanRestoreReportApplyVo.java
- * Class: com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportApplyVo
- * Description: 车辆交回事前报备申请 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-01-08 11:43:57
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "车辆交回事前报备申请 视图数据详情", description = "车辆交回事前报备申请 视图数据详情") public class LoanRestoreReportApplyDetailsVo implements Vo { @@ -60,77 +44,77 @@ public class LoanRestoreReportApplyDetailsVo implements Vo { private String 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("销售订单车辆sid") private String saleVehSid; - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String vinNo; // 车架号 - @ApiModelProperty("车牌号") + @ApiModelProperty("车牌号") private String carNum; // 车牌号 - @ApiModelProperty("客户名称") + @ApiModelProperty("客户名称") private String custName; // 客户名称 - @ApiModelProperty("贷款人") + @ApiModelProperty("贷款人") private String borrName; // 贷款人 - @ApiModelProperty("贷款合同编号") + @ApiModelProperty("贷款合同编号") private String loanContractNo; // 贷款合同编号 - @ApiModelProperty("资方") + @ApiModelProperty("资方") private String bankName; // 资方 - @ApiModelProperty("资方合同编号") + @ApiModelProperty("资方合同编号") private String bankContractNo; // 资方合同编号 - @ApiModelProperty("已还金额") + @ApiModelProperty("已还金额") private String alRepaidMoney; // 已还金额 - @ApiModelProperty("当前逾期金额") + @ApiModelProperty("当前逾期金额") private String currentBeMoney; // 当前逾期金额 - @ApiModelProperty("其中资金占用费") + @ApiModelProperty("其中资金占用费") private String wheFundOccMoney; // 其中资金占用费 - @ApiModelProperty("未到期金额") + @ApiModelProperty("未到期金额") private String unexpiredMoney; // 未到期金额 - @ApiModelProperty("总期数") + @ApiModelProperty("总期数") private String nper; // 总期数 - @ApiModelProperty("当前期数") + @ApiModelProperty("当前期数") private String currentPeriod; // 当前期数 - @ApiModelProperty("已还金额换算期数") + @ApiModelProperty("已还金额换算期数") private String alRepaidMoneyConPeriod; // 已还金额换算期数 - @ApiModelProperty("逾期金额换算期数") + @ApiModelProperty("逾期金额换算期数") private String beOverdueMoneyAndPeriod; // 逾期金额换算期数 - - @ApiModelProperty("交回方式key") + + @ApiModelProperty("交回方式key") private String restoreTypeKey; // 交回方式key - @ApiModelProperty("交回方式value") + @ApiModelProperty("交回方式value") private String restoreTypeValue; // 交回方式value - @ApiModelProperty("预交回日期") + @ApiModelProperty("预交回日期") private String restoreDate; // 预交回日期 - @ApiModelProperty("经办人sid") + @ApiModelProperty("经办人sid") private String operatorSid; // 经办人sid - @ApiModelProperty("经办人姓名") + @ApiModelProperty("经办人姓名") private String operatorName; // 经办人姓名 - @ApiModelProperty("涉及相关费用") + @ApiModelProperty("涉及相关费用") private String involveCorrMoney; // 涉及相关费用 - @ApiModelProperty("费用说明") + @ApiModelProperty("费用说明") private String costRemarks; // 费用说明 - @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("催收记录sid") private String csjlSid; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDto.java index f0b113ebc4..d5dd1d8c7b 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDto.java @@ -25,29 +25,13 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loanrestorereportapply; - import com.yxt.common.core.dto.Dto; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.util.ArrayList; import java.util.List; -/** - * Project: anrui-riskcenter(车辆交回事前报备申请)
- * File: LoanRestoreReportApplyDto.java
- * Class: com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportApplyDto
- * Description: 车辆交回事前报备申请 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-01-08 11:43:57
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "车辆交回事前报备申请 数据传输对象", description = "车辆交回事前报备申请 数据传输对象") public class LoanRestoreReportApplyDto implements Dto { @@ -58,75 +42,75 @@ public class LoanRestoreReportApplyDto 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("销售订单车辆sid") private String saleVehSid; - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String vinNo; // 车架号 - @ApiModelProperty("车牌号") + @ApiModelProperty("车牌号") private String carNum; // 车牌号 - @ApiModelProperty("客户名称") + @ApiModelProperty("客户名称") private String custName; // 客户名称 - @ApiModelProperty("贷款人") + @ApiModelProperty("贷款人") private String borrName; // 贷款人 - @ApiModelProperty("贷款合同编号") + @ApiModelProperty("贷款合同编号") private String loanContractNo; // 贷款合同编号 - @ApiModelProperty("资方") + @ApiModelProperty("资方") private String bankName; // 资方 - @ApiModelProperty("资方合同编号") + @ApiModelProperty("资方合同编号") private String bankContractNo; // 资方合同编号 - @ApiModelProperty("已还金额") + @ApiModelProperty("已还金额") private String alRepaidMoney; // 已还金额 - @ApiModelProperty("当前逾期金额") + @ApiModelProperty("当前逾期金额") private String currentBeMoney; // 当前逾期金额 - @ApiModelProperty("其中资金占用费") + @ApiModelProperty("其中资金占用费") private String wheFundOccMoney; // 其中资金占用费 - @ApiModelProperty("未到期金额") + @ApiModelProperty("未到期金额") private String unexpiredMoney; // 未到期金额 - @ApiModelProperty("总期数") + @ApiModelProperty("总期数") private String nper; // 总期数 - @ApiModelProperty("当前期数") + @ApiModelProperty("当前期数") private String currentPeriod; // 当前期数 - @ApiModelProperty("已还金额换算期数") + @ApiModelProperty("已还金额换算期数") private String alRepaidMoneyConPeriod; // 已还金额换算期数 - @ApiModelProperty("逾期金额换算期数") + @ApiModelProperty("逾期金额换算期数") private String beOverdueMoneyAndPeriod; // 逾期金额换算期数 - @ApiModelProperty("交回方式key") + @ApiModelProperty("交回方式key") private String restoreTypeKey; // 交回方式key - @ApiModelProperty("交回方式value") + @ApiModelProperty("交回方式value") private String restoreTypeValue; // 交回方式value - @ApiModelProperty("预交回日期") + @ApiModelProperty("预交回日期") private String restoreDate; // 预交回日期 - @ApiModelProperty("经办人sid") + @ApiModelProperty("经办人sid") private String operatorSid; // 经办人sid - @ApiModelProperty("经办人姓名") + @ApiModelProperty("经办人姓名") private String operatorName; // 经办人姓名 - @ApiModelProperty("涉及相关费用") + @ApiModelProperty("涉及相关费用") private String involveCorrMoney; // 涉及相关费用 - @ApiModelProperty("费用说明") + @ApiModelProperty("费用说明") private String costRemarks; // 费用说明 - @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-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordRest.java index cb348410c8..22c277f272 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordRest.java @@ -36,21 +36,8 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -/** - * Project: anrui-riskcenter(逾期催收记录)
- * File: LoanBeCollectionRecordFeignFallback.java
- * Class: com.yxt.anrui.riskcenter.biz.loanbecollectionrecord.LoanBeCollectionRecordRest
- * Description: 逾期催收记录.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-12-11 13:45:40
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "逾期催收记录") -@RestController("com.yxt.anrui.riskcenter.biz.loanbecollectionrecord.LoanBeCollectionRecordRest") +@RestController @RequestMapping("v1/loanbecollectionrecord") public class LoanBeCollectionRecordRest implements LoanBeCollectionRecordFeign { diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java index b7f6f5e1c0..45809471ec 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java @@ -39,53 +39,37 @@ import com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportAppl import java.util.List; import java.util.Map; -/** - * Project: anrui-riskcenter(车辆交回事前报备申请)
- * File: LoanRestoreReportApplyMapper.java
- * Class: com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyMapper
- * Description: 车辆交回事前报备申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-01-08 11:43:57
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Mapper public interface LoanRestoreReportApplyMapper extends BaseMapper { - //@Update("update loan_restore_report_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_restore_report_apply") - List selectListVo(); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from loan_restore_report_apply") + List selectListVo(); int updateFlowFiled(Map map); - String selectNum(String billNo); + String selectNum(String billNo); - String getYhje(String saleVehSid); + String getYhje(String saleVehSid); - String getWdqje(String saleVehSid); + String getWdqje(String saleVehSid); - String getZqs(String saleVehSid); + String getZqs(String saleVehSid); - String getDqqs(String saleVehSid); + String getDqqs(String saleVehSid); - String getYhjehsqs(String saleVehSid); + String getYhjehsqs(String saleVehSid); - String getDqyqje(String saleVehSid); + String getDqyqje(String saleVehSid); - String getQzzjzyf(String saleVehSid); + String getQzzjzyf(String saleVehSid); - String getYqjehsqs(String saleVehSid); + String getYqjehsqs(String saleVehSid); int selectBySid(String join); - LoanRestoreReportCarInfo jkCarInfo(String saleVehSid); + LoanRestoreReportCarInfo jkCarInfo(String saleVehSid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyRest.java index 97248e9ff6..5444bac0fb 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyRest.java @@ -40,21 +40,8 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -/** - * Project: anrui-riskcenter(车辆交回事前报备申请)
- * File: LoanRestoreReportApplyFeignFallback.java
- * Class: com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyRest
- * Description: 车辆交回事前报备申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-01-08 11:43:57
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "车辆交回事前报备申请") -@RestController("com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyRest") +@RestController @RequestMapping("v1/loanrestorereportapply") public class LoanRestoreReportApplyRest implements LoanRestoreReportApplyFeign { @@ -98,7 +85,7 @@ public class LoanRestoreReportApplyRest implements LoanRestoreReportApplyFeign { @Override public ResultBean init(String saleVehSid, String orgPath, String userSid) { ResultBean rb = ResultBean.fireFail(); - LoanRestoreReportApplyDetailsVo loanRestoreReportApplyDetailsVo = loanRestoreReportApplyService.init(saleVehSid, orgPath, userSid); + LoanRestoreReportApplyDetailsVo loanRestoreReportApplyDetailsVo = loanRestoreReportApplyService.init(saleVehSid, orgPath, userSid); return rb.success().setData(loanRestoreReportApplyDetailsVo); }