diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml index 9ae4ef5c5d..1cee95708d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml @@ -194,7 +194,7 @@ )), 0 ) < p.dueMoney - AND p.dueDate < last_day(date_sub(now(),interval -1 month)) +-- AND p.dueDate < last_day(date_sub(now(),interval -1 month)) AND p.useOrgSid = #{userOrgSid} UNION ALL SELECT diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyAppVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyAppVo.java index 97dbf46836..c260c27ee5 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyAppVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyAppVo.java @@ -128,5 +128,12 @@ public class SettleApplyAppVo { @ApiModelProperty("截止当前资金占用费") private String fundAll; - + @ApiModelProperty("资方贷款保证金") + private String loanDepositBank; + @ApiModelProperty("是否抵顶") + private String topping; + @ApiModelProperty("资方收款账号") + private String bankAccount; + @ApiModelProperty("资方收款账户") + private String accountName; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java index e9093c9a4c..71e7f1a058 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java @@ -734,6 +734,7 @@ public class LoanSettleApplyService extends MybatisBaseService fileList = Arrays.asList(loanSettleBankCost.getFiles().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); fileList.removeAll(Collections.singleton(null)); @@ -2258,21 +2291,35 @@ public class LoanSettleApplyService extends MybatisBaseService