优化结清管理退还资方垫款部分和还款记录展示

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -5655,6 +5655,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         for (AppFinSelectedReceivablesDetailedRskDto v : finSelectedReceivablesDetailedDtos) {
             //已选
             FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
+            finSelectedReceivablesDetailed.setRemarks("间还");
             // BeanUtil.copyProperties(v, finSelectedReceivablesDetailed, "sid");
             if (StringUtils.isNotBlank(v.getVin())) {
                 String[] splitVin = v.getVin().split("/");

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml

@@ -398,7 +398,7 @@
         j.reveivableMoney AS dueMoney,
         s.subscriptionDate AS actualDate,
         s.subscriptionMoney AS actualMoney,
-        '' AS returnWay,
+        s.remarks AS returnWay,
         '' AS dataTime,
         '' AS updateTime,
         '' AS updateState,
@@ -416,6 +416,11 @@
         WHERE
         s.receivablesName = '资金占用费'
         OR s.receivablesName = '资方逾期利息'
+        OR s.receivablesName = '资方退还垫款'
+        OR s.receivablesName = '其他费用'
+        OR s.receivablesName = '合同违约金'
+        OR s.receivablesName = '名义价'
+        OR s.receivablesName = '结清时资方逾期利息'
         AND s.auditState = 3
         ) AS a
         <where>

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}
+        WHERE p.busVinSid = #{busVinSid} AND s.auditState = '3' AND s.createTime > #{formatDate} and s.receivablesName != '资方退还垫款'
     </select>
     <select id="selDueMoneyByBusVinSidAndCloseDate" resultType="java.lang.String">
         SELECT

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

@@ -1361,31 +1361,31 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
             selectList.add(fin);
         }
-        //资方退还垫款应收
-        List<PlanNoReturnMoney> p7 = baseMapper.selNoReturnJrMoneyByBusVinSidAndKeyDesc(busVinSid, "007");
-        p7.removeAll(Collections.singleton(null));
-        if (!p7.isEmpty() && p7.size() > 0) {
-            for (PlanNoReturnMoney m : p7) {
-                BigDecimal money = new BigDecimal(m.getMoney());
-                String sid = m.getSid();
-                LoanRepaymentPlanDetails pd = loanRepaymentPlanDetailsService.fetchBySid(sid);
-                FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
-                fin.setCreateBySid(userSid);
-                fin.setRemarks("减免");
-                fin.setVIN(pd.getVinNo());
-                fin.setUseOrgSid(pd.getUseOrgSid());
-                fin.setReceivablesName("资方退还垫款");
-                fin.setSubscriptionMoney(money);
-                fin.setSubscriptionDate(DateUtil.today());
-                fin.setAuditState(3);
-                fin.setAuditDate(DateUtil.today());
-                fin.setReceivablesSid(m.getJrSid());
-                fin.setKxState("01");
-                fin.setUseOrgName(pd.getUseOrgName());
-                fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
-                selectList.add(fin);
-            }
-        }
+//        //资方退还垫款应收
+//        List<PlanNoReturnMoney> p7 = baseMapper.selNoReturnJrMoneyByBusVinSidAndKeyDesc(busVinSid, "007");
+//        p7.removeAll(Collections.singleton(null));
+//        if (!p7.isEmpty() && p7.size() > 0) {
+//            for (PlanNoReturnMoney m : p7) {
+//                BigDecimal money = new BigDecimal(m.getMoney());
+//                String sid = m.getSid();
+//                LoanRepaymentPlanDetails pd = loanRepaymentPlanDetailsService.fetchBySid(sid);
+//                FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
+//                fin.setCreateBySid(userSid);
+//                fin.setRemarks("减免");
+//                fin.setVIN(pd.getVinNo());
+//                fin.setUseOrgSid(pd.getUseOrgSid());
+//                fin.setReceivablesName("资方退还垫款");
+//                fin.setSubscriptionMoney(money);
+//                fin.setSubscriptionDate(DateUtil.today());
+//                fin.setAuditState(3);
+//                fin.setAuditDate(DateUtil.today());
+//                fin.setReceivablesSid(m.getJrSid());
+//                fin.setKxState("01");
+//                fin.setUseOrgName(pd.getUseOrgName());
+//                fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
+//                selectList.add(fin);
+//            }
+//        }
         //对应的垫款金额、资方逾期利息设置0
         List<LoanRepaymentPlanDetails> ps = baseMapper.selectPlanListByBusVinSid(busVinSid);
         ps.removeAll(Collections.singleton(null));