Merge remote-tracking branch 'origin/master'

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;
     @ApiModelProperty("回购原因")
     private String buybacksReason;
-    @ApiModelProperty("资方收款账户")
-    private String bankReceivingAccount;
-    @ApiModelProperty("资方收款账号")
-    private String bankAccountNo;
     @ApiModelProperty("付款时需备注内容")
     private String payRemarks;
 }

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

@@ -30,7 +30,7 @@ public class LoanRepurchaseApplyDetailsVo implements Vo {
     private String taskId;
     @ApiModelProperty("实例id")
     private String instanceId;
-   // private LoanRepurchaseSolutionsDetailsssVo solutionsDetailsssVo = new LoanRepurchaseSolutionsDetailsssVo();
+    // private LoanRepurchaseSolutionsDetailsssVo solutionsDetailsssVo = new LoanRepurchaseSolutionsDetailsssVo();
     //主体
     @ApiModelProperty("申请日期")
     private String applyDate;
@@ -75,10 +75,6 @@ public class LoanRepurchaseApplyDetailsVo implements Vo {
     private String amount;
     @ApiModelProperty("回购原因")
     private String buybacksReason;
-    @ApiModelProperty("资方收款账户")
-    private String bankReceivingAccount;
-    @ApiModelProperty("资方收款账号")
-    private String bankAccountNo;
     @ApiModelProperty("付款后需备注内容")
     private String payRemarks;
     private List<LoanRepurchaseApplyFile> buyfiles = new ArrayList<>(); // 回购情况附件

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;
     @ApiModelProperty("回购原因")
     private String buybacksReason;
-    @ApiModelProperty("资方收款账户")
-    private String bankReceivingAccount;
-    @ApiModelProperty("资方收款账号")
-    private String bankAccountNo;
     @ApiModelProperty("付款后需备注内容")
     private String payRemarks;
     private List<LoanRepurchaseApplyFile> buyfiles = new ArrayList<>(); // 回购情况附件

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;
     @ApiModelProperty("公司当期未到期月还")
     private String companyCurrentNotPrice;
-    @ApiModelProperty("资方未到期金额")
+    @ApiModelProperty("公司未到期金额")
     private String bankNotPrice;
     @ApiModelProperty("贷款保证金扣罚金额")
     private String deductionAmount;

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