结清申请优化流程3

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java

@@ -298,7 +298,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                 dto1.setDimensionDept(voucherDetail.getDeptCode());
                 dto1.setDimensionCustom(voucherDetail.getCustomerCode());
                 dto2.setDimensionDept(voucherDetail.getDeptCode());
-                if (!voucherDetail.getSceneCode().equals("资金占用费减免")) {
+                if (!voucherDetail.getSceneCode().equals("资金占用费减免") && !voucherDetail.getSceneCode().equals("贷款保证金扣罚")) {
                     dto2.setDimensionCustom(voucherDetail.getCustomerCode());
                 }
                 resultDetails.add(dto1);

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

@@ -333,7 +333,7 @@ FROM (
             loan_repayment_plan_details AS p
                 LEFT JOIN anrui_fin.fin_uncollected_receivables_detailed_jr as jr ON p.sid = jr.busSid
                 LEFT JOIN anrui_fin.fin_selected_receivables_detailed as s ON jr.sid = s.receivablesSid
-        WHERE p.busVinSid = #{busVinSid} AND s.auditState = '3' AND s.createTime > #{formatDate} and s.receivablesName != '资方退还垫款'
+        WHERE p.busVinSid = #{busVinSid} AND s.auditState = '3' AND s.createTime > #{formatDate} and s.receivablesName != '资方退还垫款' and s.remarks != '结清减免'
     </select>
     <select id="selDueMoneyByBusVinSidAndCloseDate" resultType="java.lang.String">
         SELECT
@@ -341,7 +341,7 @@ FROM (
         FROM
             loan_repayment_plan_details AS p
                 LEFT JOIN loan_repayment_history as h ON p.sid = h.planDetailSid
-        WHERE p.busVinSid = #{busVinSid} AND h.updateState = '1' AND h.dataTime > #{formatDate}
+        WHERE p.busVinSid = #{busVinSid} AND h.updateState = '1' AND h.dataTime > #{formatDate} AND h.returnWay != '结清减免'
     </select>
     <select id="selectPlanListByBusVinSid"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails">

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/settleapply/SettleApplyAppVos.java

@@ -138,4 +138,9 @@ public class SettleApplyAppVos {
     private String bankAccount;
     @ApiModelProperty("资方收款账户")
     private String accountName;
+
+    @ApiModelProperty("公司未到期利息减免")
+    private String notDuePriceRelief;
+    @ApiModelProperty("减免依据")
+    private String reliefBasis;
 }