yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 2 weeks ago
parent
ca84c368ea 87a66d316e
commit
710ba13045
7 changed files with 93 additions and 180 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java
  2. 21
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  3. 84
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDetailsVo.java
  4. 84
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDto.java
  5. 15
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordRest.java
  6. 44
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java
  7. 17
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyRest.java

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java
View File

@ -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;

21
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
View File

@ -3546,6 +3546,11 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
} else if ("0".equals(query.getIsSales())) {
qw.isNull("bv.salesDate");
}
if ("1".equals(query.getIsSettle())) {
qw.eq("vs.finState", 1);
} else if ("0".equals(query.getIsSettle())) {
qw.and(wrapper -> 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<BaseVehicleMapper, Ba
qw.groupBy("bv.sid");
qw.orderByDesc("bv.createTime");
IPage<PayBaseVehicleVo> pagging = baseMapper.selectPayVehicleList(page, qw);
Iterator<PayBaseVehicleVo> 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<PayBaseVehicleVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}

84
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDetailsVo.java
View File

@ -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(车辆交回事前报备申请) <br/>
* File: LoanRestoreReportApplyVo.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportApplyVo <br/>
* Description: 车辆交回事前报备申请 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-01-08 11:43:57 <br/>
*
* @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;

84
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDto.java
View File

@ -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(车辆交回事前报备申请) <br/>
* File: LoanRestoreReportApplyDto.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportApplyDto <br/>
* Description: 车辆交回事前报备申请 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-01-08 11:43:57 <br/>
*
* @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("附件路径")

15
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordRest.java
View File

@ -36,21 +36,8 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui-riskcenter(逾期催收记录) <br/>
* File: LoanBeCollectionRecordFeignFallback.java <br/>
* Class: com.yxt.anrui.riskcenter.biz.loanbecollectionrecord.LoanBeCollectionRecordRest <br/>
* Description: 逾期催收记录. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-12-11 13:45:40 <br/>
*
* @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 {

44
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java
View File

@ -39,53 +39,37 @@ import com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportAppl
import java.util.List;
import java.util.Map;
/**
* Project: anrui-riskcenter(车辆交回事前报备申请) <br/>
* File: LoanRestoreReportApplyMapper.java <br/>
* Class: com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyMapper <br/>
* Description: 车辆交回事前报备申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-01-08 11:43:57 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface LoanRestoreReportApplyMapper extends BaseMapper<LoanRestoreReportApply> {
//@Update("update loan_restore_report_apply set name=#{msg} where id=#{id}")
//IPage<LoanRestoreReportApplyVo> voPage(IPage<LoanRestoreReportApply> page, @Param(Constants.WRAPPER) QueryWrapper<LoanRestoreReportApply> qw);
IPage<LoanRestoreReportApplyVo> selectPageVo(IPage<LoanRestoreReportApply> page, @Param(Constants.WRAPPER) Wrapper<LoanRestoreReportApply> qw);
IPage<LoanRestoreReportApplyVo> selectPageVo(IPage<LoanRestoreReportApply> page, @Param(Constants.WRAPPER) Wrapper<LoanRestoreReportApply> qw);
List<LoanRestoreReportApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanRestoreReportApply> qw);
List<LoanRestoreReportApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanRestoreReportApply> qw);
@Select("select * from loan_restore_report_apply")
List<LoanRestoreReportApplyVo> selectListVo();
@Select("select * from loan_restore_report_apply")
List<LoanRestoreReportApplyVo> selectListVo();
int updateFlowFiled(Map<String, Object> 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);
}

17
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyRest.java
View File

@ -40,21 +40,8 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui-riskcenter(车辆交回事前报备申请) <br/>
* File: LoanRestoreReportApplyFeignFallback.java <br/>
* Class: com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyRest <br/>
* Description: 车辆交回事前报备申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-01-08 11:43:57 <br/>
*
* @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<LoanRestoreReportApplyDetailsVo> 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);
}

Write Preview
Loading…
Cancel
Save