diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPayment.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPayment.java
index ae0d13c1e3..0fc2d9a152 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPayment.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPayment.java
@@ -31,19 +31,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-/**
- * Project: anrui-fin(付款信息管理)
- * File: FinPayment.java
- * Class: com.yxt.anrui.fin.api.finpayment.FinPayment
- * Description: 付款信息管理.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-13 14:27:54
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "付款信息管理", description = "付款信息管理")
@TableName("fin_payment")
@@ -51,19 +38,17 @@ public class FinPayment extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("单位编码")
- private String companyCode; // 单位编码
+ private String companyCode;
@ApiModelProperty("单位名称")
- private String companyName; // 单位名称
+ private String companyName;
@ApiModelProperty("开户行")
- private String bank; // 开户行
+ private String bank;
@ApiModelProperty("收款银行账号")
- private String receivingAccount; // 收款银行账号
- @ApiModelProperty("业务类型key")
- private String businessTypeKey; // 业务类型key
- @ApiModelProperty("业务类型value")
- private String businessTypeValue; // 业务类型value
+ private String receivingAccount;
+ @ApiModelProperty("银行简称")
+ private String bankShortName;
@ApiModelProperty("分公司sid")
- private String useOrgSid; // 分公司sid
+ private String useOrgSid;
@ApiModelProperty("分公司名称")
private String useOrgName;
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDetailsVo.java
index 3303b5ab1a..ee0d5b335c 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDetailsVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDetailsVo.java
@@ -25,26 +25,11 @@
*********************************************************/
package com.yxt.anrui.fin.api.finpayment;
-
import com.yxt.common.core.vo.Vo;
-
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-/**
- * Project: anrui-fin(付款信息管理)
- * File: FinPaymentVo.java
- * Class: com.yxt.anrui.fin.api.finpayment.FinPaymentVo
- * Description: 付款信息管理 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-13 14:27:54
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "付款信息管理 视图数据详情", description = "付款信息管理 视图数据详情")
public class FinPaymentDetailsVo implements Vo {
@@ -52,18 +37,16 @@ public class FinPaymentDetailsVo implements Vo {
private String sid; // sid
private String remarks;
- @ApiModelProperty("单位编码")
+ @ApiModelProperty("单位编码")
private String companyCode; // 单位编码
- @ApiModelProperty("单位名称")
+ @ApiModelProperty("单位名称")
private String companyName; // 单位名称
- @ApiModelProperty("开户行")
+ @ApiModelProperty("开户行")
private String bank; // 开户行
- @ApiModelProperty("收款银行账号")
+ @ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
- @ApiModelProperty("业务类型key")
- private String businessTypeKey; // 业务类型key
- @ApiModelProperty("业务类型value")
- private String businessTypeValue; // 业务类型value
+ @ApiModelProperty("银行简称")
+ private String bankShortName;
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java
index 0d7ffe37d2..67e2af2957 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java
@@ -25,26 +25,11 @@
*********************************************************/
package com.yxt.anrui.fin.api.finpayment;
-
import com.yxt.common.core.dto.Dto;
-
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-/**
- * Project: anrui-fin(付款信息管理)
- * File: FinPaymentDto.java
- * Class: com.yxt.anrui.fin.api.finpayment.FinPaymentDto
- * Description: 付款信息管理 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-13 14:27:54
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "付款信息管理 数据传输对象", description = "付款信息管理 数据传输对象")
public class FinPaymentDto implements Dto {
@@ -60,10 +45,8 @@ public class FinPaymentDto implements Dto {
private String bank; // 开户行
@ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
- @ApiModelProperty("业务类型key")
- private String businessTypeKey; // 业务类型key
- @ApiModelProperty("业务类型value")
- private String businessTypeValue; // 业务类型value
+ @ApiModelProperty("银行简称")
+ private String bankShortName;
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentQuery.java
index 70f826f69e..f275105078 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentQuery.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentQuery.java
@@ -53,8 +53,8 @@ public class FinPaymentQuery implements Query {
private String companyName;
@ApiModelProperty("收款银行账号")
private String receivingAccount;
- @ApiModelProperty("业务类型value")
- private String businessTypeValue;
+ @ApiModelProperty("开户行")
+ private String bank;
private String userSid;
private String orgPath;
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentVo.java
index 286e120d75..d2f9be2589 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentVo.java
@@ -59,8 +59,8 @@ public class FinPaymentVo implements Vo {
private String bank;
@ApiModelProperty("收款银行账号")
private String receivingAccount;
- @ApiModelProperty("业务类型value")
- private String businessTypeValue;
+ @ApiModelProperty("银行简称")
+ private String bankShortName;
@ApiModelProperty("备注")
private String remarks;
}
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelow.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelow.java
index e817645258..29d8d256af 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelow.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelow.java
@@ -26,53 +26,50 @@
package com.yxt.anrui.fin.api.finpaymentapplydetailsbelow;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
+import java.util.Date;
-/**
- * Project: anrui-fin(付款明细)
- * File: FinPaymentapplyDetailsBelow.java
- * Class: com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelow
- * Description: 付款申请明细-明细.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-12 16:08:28
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "付款申请明细-明细", description = "付款申请明细-明细")
@TableName("fin_paymentapply_details_below")
public class FinPaymentapplyDetailsBelow extends BaseEntity {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("款项名称,数据字典")
+ @ApiModelProperty("款项名称,数据字典")
private String costTitleKey; // 款项名称,数据字典
- @ApiModelProperty("款项名称")
+ @ApiModelProperty("款项名称")
private String costTitleValue; // 款项名称
- @ApiModelProperty("付款方式key")
+ @ApiModelProperty("付款方式key")
private String paymentTypeKey; // 付款方式key
- @ApiModelProperty("付款方式value")
+ @ApiModelProperty("付款方式value")
private String paymentType; // 付款方式value
- @ApiModelProperty("收款单位名称")
+ @ApiModelProperty("收款单位名称")
private String receiveCompany; // 收款单位名称
- @ApiModelProperty("收款单位sid")
+ @ApiModelProperty("收款单位sid")
private String receiveCompanySid; // 收款单位sid
- @ApiModelProperty("开户行")
+ @ApiModelProperty("开户行")
private String bank; // 开户行
- @ApiModelProperty("收款银行账号")
+ @ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
- @ApiModelProperty("付款金额")
+ @ApiModelProperty("付款金额")
private BigDecimal payAccount; // 付款金额
- @ApiModelProperty("付款申请明细sid")
+ @ApiModelProperty("付款申请明细sid")
private String detailSid; // 付款申请明细sid
- @ApiModelProperty("后期是否有平仓付款")
+ @ApiModelProperty("后期是否有平仓付款")
private String isPay; // 后期是否有平仓付款
-
+ @ApiModelProperty("平仓款名称")
+ private String closFundName;
+ @ApiModelProperty("开通日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date openDate;
+ @ApiModelProperty("付款单位sid")
+ private String payCompanySid;
+ @ApiModelProperty("付款单位")
+ private String payCompany;
}
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowDetailsVo.java
index 06004a6cf6..890c0ad41f 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowDetailsVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowDetailsVo.java
@@ -25,30 +25,16 @@
*********************************************************/
package com.yxt.anrui.fin.api.finpaymentapplydetailsbelow;
-
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo;
import com.yxt.common.core.vo.Vo;
-
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
-/**
- * Project: anrui-fin(付款明细)
- * File: FinPaymentapplyDetailsBelowVo.java
- * Class: com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowVo
- * Description: 付款申请明细-明细 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-12 16:08:28
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "付款申请明细-明细 视图数据详情", description = "付款申请明细-明细 视图数据详情")
public class FinPaymentapplyDetailsBelowDetailsVo implements Vo {
@@ -79,6 +65,15 @@ public class FinPaymentapplyDetailsBelowDetailsVo implements Vo {
private String detailSid; // 付款申请明细sid
@ApiModelProperty("后期是否有平仓付款")
private String isPay; // 后期是否有平仓付款
+ @ApiModelProperty("平仓款名称")
+ private String closFundName;
+ @ApiModelProperty("开通日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date openDate;
+ @ApiModelProperty("付款单位sid")
+ private String payCompanySid;
+ @ApiModelProperty("付款单位")
+ private String payCompany;
@ApiModelProperty
private List finPaymentapplyDetailsBelowEveList;
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowDto.java
index 9ba9b38cb2..a6a5d6eafa 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowDto.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowDto.java
@@ -25,7 +25,7 @@
*********************************************************/
package com.yxt.anrui.fin.api.finpaymentapplydetailsbelow;
-
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDto;
import com.yxt.common.core.dto.Dto;
@@ -35,21 +35,9 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
-/**
- * Project: anrui-fin(付款明细)
- * File: FinPaymentapplyDetailsBelowDto.java
- * Class: com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDto
- * Description: 付款申请明细-明细 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-12 16:08:28
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "付款申请明细-明细 数据传输对象", description = "付款申请明细-明细 数据传输对象")
public class FinPaymentapplyDetailsBelowDto implements Dto {
@@ -58,28 +46,37 @@ public class FinPaymentapplyDetailsBelowDto implements Dto {
@ApiModelProperty("备注")
private String remarks;
- @ApiModelProperty("款项名称,数据字典")
+ @ApiModelProperty("款项名称,数据字典")
private String costTitleKey; // 款项名称,数据字典
- @ApiModelProperty("款项名称")
+ @ApiModelProperty("款项名称")
private String costTitleValue; // 款项名称
- @ApiModelProperty("付款方式key")
+ @ApiModelProperty("付款方式key")
private String paymentTypeKey; // 付款方式key
- @ApiModelProperty("付款方式value")
+ @ApiModelProperty("付款方式value")
private String paymentType; // 付款方式value
- @ApiModelProperty("收款单位名称")
+ @ApiModelProperty("收款单位名称")
private String receiveCompany; // 收款单位名称
- @ApiModelProperty("收款单位sid")
+ @ApiModelProperty("收款单位sid")
private String receiveCompanySid; // 收款单位sid
- @ApiModelProperty("开户行")
+ @ApiModelProperty("开户行")
private String bank; // 开户行
- @ApiModelProperty("收款银行账号")
+ @ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
- @ApiModelProperty("付款金额")
+ @ApiModelProperty("付款金额")
private BigDecimal payAccount; // 付款金额
- @ApiModelProperty("付款申请明细sid")
+ @ApiModelProperty("付款申请明细sid")
private String detailSid; // 付款申请明细sid
- @ApiModelProperty("后期是否有平仓付款")
+ @ApiModelProperty("后期是否有平仓付款")
private String isPay; // 后期是否有平仓付款
+ @ApiModelProperty("平仓款名称")
+ private String closFundName;
+ @ApiModelProperty("开通日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date openDate;
+ @ApiModelProperty("付款单位sid")
+ private String payCompanySid;
+ @ApiModelProperty("付款单位")
+ private String payCompany;
@ApiModelProperty
private List finPaymentapplyDetailsBelowEveList;
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java
index bfcfd54fc8..9c26d57125 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java
@@ -28,7 +28,6 @@ package com.yxt.anrui.fin.biz.finpaymentapply;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.fin.api.finpaymentapply.*;
import com.yxt.anrui.fin.api.finpaymentapply.flow.*;
-import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -37,22 +36,8 @@ import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-
import java.util.List;
-/**
- * Project: anrui-fin(财务)
- * File: FinPaymentapplyFeignFallback.java
- * Class: com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyRest
- * Description: fin_paymentapply.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-06-23 13:45:10
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Api(tags = "付款申请")
@RestController
@RequestMapping("v1/finpaymentapply")
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java
index 18cbad3a52..343bc5e567 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java
@@ -1,6 +1,7 @@
package com.yxt.anrui.fin.biz.finpaymentapplydetails;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply;
import com.yxt.anrui.fin.api.finpaymentapplydetails.AppFinPaymentapplyDetailVo;
import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailDto;
@@ -15,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
/**
@@ -53,6 +55,7 @@ public class FinPaymentapplyDetailsService extends MybatisBaseService finPaymentapplyDetailsBelowList = dto.getFinPaymentapplyDetailsBelowList();
for (FinPaymentapplyDetailsBelowDto finPaymentapplyDetailsBelowDto : finPaymentapplyDetailsBelowList) {
finPaymentapplyDetailsBelowDto.setDetailSid(finPaymentapplyDetails.getSid());
+ finPaymentapplyDetailsBelowDto.setClosFundName(DateUtil.formatDate(new Date()) + dto.getPaymentType() + dto.getBank() + "出票" + new BigDecimal(dto.getPayAccount()).divide(new BigDecimal(10000)) + "万元");
String belowSid = finPaymentapplyDetailsBelowService.insertByDto(finPaymentapplyDetailsBelowDto);
List finPaymentapplyDetailsBelowEveList = finPaymentapplyDetailsBelowDto.getFinPaymentapplyDetailsBelowEveList();
for (FinPaymentapplyDetailsBelowEveDto finPaymentapplyDetailsBelowEveDto : finPaymentapplyDetailsBelowEveList) {
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml
index 61f3d3f313..1c70152cb1 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml
@@ -62,7 +62,12 @@
WHEN 1 THEN '控制成功'
WHEN 2 THEN '控制失败'
WHEN 3 THEN '已解控'
- END AS lockCarState
+ END AS lockCarState,
+ CASE
+ WHEN lrpd.dueDate > lrpd.updateDate or lrpd.updateDate IS NULL THEN '1'
+ WHEN lrpd.dueDate <= lrpd.updateDate AND (c.outstandingMoney + IFNULL(c.fund,0) + IFNULL(lrpd.paymentInterest,0)) > 0 THEN '0'
+ WHEN lrpd.dueDate <= lrpd.updateDate AND (c.outstandingMoney + IFNULL(c.fund,0) + IFNULL(lrpd.paymentInterest,0)) <= 0 THEN '1'
+ END AS nowOverdue
FROM loan_repayment_plan_details lrpd
LEFT JOIN loan_repayment_history lrh
ON lrh.planDetailSid = lrpd.sid