Browse Source

修改

master
ligaode 2 weeks ago
parent
commit
0729922103
  1. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApply.java
  2. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyDetailsVo.java
  3. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyDto.java
  4. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseCompanyCostVo.java
  5. 20
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApply.java

@ -78,10 +78,6 @@ public class LoanRepurchaseApply extends BaseEntity {
private String orgSidPath; private String orgSidPath;
@ApiModelProperty("回购原因") @ApiModelProperty("回购原因")
private String buybacksReason; private String buybacksReason;
@ApiModelProperty("资方收款账户")
private String bankReceivingAccount;
@ApiModelProperty("资方收款账号")
private String bankAccountNo;
@ApiModelProperty("付款时需备注内容") @ApiModelProperty("付款时需备注内容")
private String payRemarks; private String payRemarks;
} }

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyDetailsVo.java

@ -75,10 +75,6 @@ public class LoanRepurchaseApplyDetailsVo implements Vo {
private String amount; private String amount;
@ApiModelProperty("回购原因") @ApiModelProperty("回购原因")
private String buybacksReason; private String buybacksReason;
@ApiModelProperty("资方收款账户")
private String bankReceivingAccount;
@ApiModelProperty("资方收款账号")
private String bankAccountNo;
@ApiModelProperty("付款后需备注内容") @ApiModelProperty("付款后需备注内容")
private String payRemarks; private String payRemarks;
private List<LoanRepurchaseApplyFile> buyfiles = new ArrayList<>(); // 回购情况附件 private List<LoanRepurchaseApplyFile> buyfiles = new ArrayList<>(); // 回购情况附件

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyDto.java

@ -70,10 +70,6 @@ public class LoanRepurchaseApplyDto implements Dto {
private String amount; private String amount;
@ApiModelProperty("回购原因") @ApiModelProperty("回购原因")
private String buybacksReason; private String buybacksReason;
@ApiModelProperty("资方收款账户")
private String bankReceivingAccount;
@ApiModelProperty("资方收款账号")
private String bankAccountNo;
@ApiModelProperty("付款后需备注内容") @ApiModelProperty("付款后需备注内容")
private String payRemarks; private String payRemarks;
private List<LoanRepurchaseApplyFile> buyfiles = new ArrayList<>(); // 回购情况附件 private List<LoanRepurchaseApplyFile> buyfiles = new ArrayList<>(); // 回购情况附件

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseCompanyCostVo.java

@ -23,7 +23,7 @@ public class LoanRepurchaseCompanyCostVo {
private String bankOverInterest; private String bankOverInterest;
@ApiModelProperty("公司当期未到期月还") @ApiModelProperty("公司当期未到期月还")
private String companyCurrentNotPrice; private String companyCurrentNotPrice;
@ApiModelProperty("资方未到期金额") @ApiModelProperty("公司未到期金额")
private String bankNotPrice; private String bankNotPrice;
@ApiModelProperty("贷款保证金扣罚金额") @ApiModelProperty("贷款保证金扣罚金额")
private String deductionAmount; private String deductionAmount;

20
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml

@ -21,7 +21,7 @@
<select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApplyVo"> <select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApplyVo">
select la.sid, select la.sid,
la.`state`, la.state,
la.createBySid, la.createBySid,
if(length(la.nodeState) > 0, la.nodeState, '待提交') as nodeState, if(length(la.nodeState) > 0, la.nodeState, '待提交') as nodeState,
la.useOrgName, la.useOrgName,
@ -134,13 +134,13 @@ FROM (
<select id="selectGsYqYh" resultType="java.lang.String"> <select id="selectGsYqYh" resultType="java.lang.String">
select ifnull(sum(ss.yq_total), 0) select ifnull(sum(ss.yq_total), 0)
from (SELECT (lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))) AS yq_total from (SELECT (lrpd.dueMoney - SUM(IFNULL(lrh.actualMoney, 0))) AS yq_total
FROM `loan_repayment_plan_details` lrpd FROM loan_repayment_plan_details lrpd
LEFT JOIN `loan_repayment_history` lrh ON lrh.planDetailSid = lrpd.`sid` LEFT JOIN loan_repayment_history lrh ON lrh.planDetailSid = lrpd.sid
WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt;
#{settingDate} #{settingDate}
AND lrpd.`busVinSid` = #{busVinSid} AND lrpd.busVinSid = #{busVinSid}
GROUP BY lrpd.`sid`) ss GROUP BY lrpd.sid) ss
</select> </select>
<select id="selectGsDqWdq" resultType="java.lang.String"> <select id="selectGsDqWdq" resultType="java.lang.String">
@ -164,13 +164,13 @@ FROM (
FROM FROM
( (
SELECT SELECT
lrpd.`dueMoney`, lrpd.dueMoney,
lrpd.sid lrpd.sid
FROM FROM
loan_repayment_plan_details lrpd loan_repayment_plan_details lrpd
WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &gt;= #{settingDate} WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &gt;= #{settingDate}
and DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; DATE_FORMAT(LAST_DAY(#{settingDate}), '%Y-%m-%d') and DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; DATE_FORMAT(LAST_DAY(#{settingDate}), '%Y-%m-%d')
AND lrpd.`busVinSid` = #{busVinSid} AND lrpd.busVinSid = #{busVinSid}
) a ) a
</select> </select>
@ -196,13 +196,13 @@ FROM (
FROM FROM
( (
SELECT SELECT
lrpd.`dueMoney`, lrpd.dueMoney,
lrpd.sid lrpd.sid
FROM FROM
loan_repayment_plan_details lrpd loan_repayment_plan_details lrpd
WHERE WHERE
DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &gt; DATE_FORMAT(LAST_DAY(#{settingDate}), '%Y-%m-%d') DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &gt; DATE_FORMAT(LAST_DAY(#{settingDate}), '%Y-%m-%d')
AND lrpd.`busVinSid` = #{busVinSid} AND lrpd.busVinSid = #{busVinSid}
) a) b ) a) b
</select> </select>
<select id="selvehOverdueCount" resultType="java.lang.Integer"> <select id="selvehOverdueCount" resultType="java.lang.Integer">

Loading…
Cancel
Save