Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml

@@ -182,6 +182,7 @@
         p.bankName AS bankName
         FROM
         anrui_riskcenter.loan_repayment_plan_details AS p
+        LEFT JOIN anrui_buscenter.bus_sales_order_vehicle as v ON p.busVinSid = v.sid
         WHERE
         IFNULL(((
         SELECT
@@ -194,7 +195,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 )) OR v.settleState = 3)
         AND p.useOrgSid = #{userOrgSid}
         UNION ALL
         SELECT

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

@@ -381,7 +381,6 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = voucher.getVoucherDetails();
         if (!voucherDetails.isEmpty()) {
             for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
-
                 Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方
                 Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
                 dto1.setSummary(voucherDetail.getBankName() + "划扣");
@@ -548,8 +547,8 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                 }
                 dto1.setDebit(String.valueOf(amountAll));
                 resultDetails.add(0, dto1);
-                newVoucher.setResultDetails(resultDetails);
             }
+            newVoucher.setResultDetails(resultDetails);
         }
         log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher));
         return voucherService.saveVoucher(newVoucher);

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;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlevehicle/LoanSettleVehicleVo.java

@@ -33,8 +33,8 @@ public class LoanSettleVehicleVo {
     @ApiModelProperty("贷款人")
     private String loanName;
 
-    @ApiModelProperty("期数")
-    private String peroid;
+//    @ApiModelProperty("期数")
+//    private String peroid;
     @ApiModelProperty("结清日期")
     private String settingDate;
     @ApiModelProperty("资方结清金额")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java

@@ -99,4 +99,6 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper<LoanRepayment
     void saveList(@Param("list") List<LoanRepaymentPlanDetails> list);
 
     List<AppRepaymentPlanRecord> selByMainSidAndVinNo(@Param("scheduleSid") String scheduleSid, @Param("vinNo") String vinNo);
+
+    void updatePaymentMoneyBySids(@Param("planSids") List<String> planSids);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml

@@ -595,6 +595,14 @@
             #{item.id}
         </foreach>
     </update>
+    <update id="updatePaymentMoneyBySids">
+        update loan_repayment_plan_details
+        set paymentMoney = 0,paymentInterest = 0
+        where sid in
+        <foreach collection="planSids" item="planSid" open="(" close=")" separator=",">
+            #{planSid}
+        </foreach>
+    </update>
 
 
     <select id="selVehSidAndPeriod"

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java

@@ -364,4 +364,8 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
             baseMapper.updateById(planDetails);
         }
     }
+
+    public void updatePaymentMoneyBySids(List<String> sids) {
+        baseMapper.updatePaymentMoneyBySids(sids);
+    }
 }

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

@@ -70,4 +70,8 @@ public interface LoanSettleApplyMapper extends BaseMapper<LoanSettleApply> {
     String selJrMoneyByBusVinSidAndCloseDate(@Param("busVinSid") String busVinSid, @Param("formatDate") String formatDate);
 
     String selDueMoneyByBusVinSidAndCloseDate(@Param("busVinSid")String busVinSid, @Param("formatDate")String formatDate);
+
+    List<LoanRepaymentPlanDetails> selectPlanListByBusVinSid(@Param("busVinSid") String busVinSid);
+
+    void updatePaymentStateByBusVinSid(@Param("busVinSid") String busVinSid);
 }

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

@@ -183,6 +183,14 @@ FROM (
         set settleState = #{state},settleApplyDate =#{date}
         where sid = #{busVinSid}
     </update>
+    <update id="updatePaymentStateByBusVinSid">
+        UPDATE loan_repayment_history as h
+            JOIN loan_repayment_plan_details as p ON h.planDetailSid = p.sid
+            SET h.paymentStateKey = '003',
+                h.paymentState = '已转付'
+        WHERE
+            p.busVinSid = #{busVinSid} AND h.returnWay = '间还'
+    </update>
 
     <select id="selectByBusVinSidAndDesc"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails">
@@ -335,4 +343,8 @@ FROM (
                 LEFT JOIN loan_repayment_history as h ON p.sid = h.planDetailSid
         WHERE p.busVinSid = #{busVinSid} AND h.updateState = '1' AND h.dataTime > #{formatDate}
     </select>
+    <select id="selectPlanListByBusVinSid"
+            resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails">
+        select * from loan_repayment_plan_details where busVinSid = #{busVinSid}
+    </select>
 </mapper>

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<LoanSettleApplyMa
                 loanSettleApply = fetchBySid(businessSid);
                 loanSettleApply.setCloseDate(new Date());
                 loanSettleApply.setSettingDate(DateUtil.today());
+                baseMapper.updateBus(loanSettleApply.getBusVinSid(), "3");
                 if (loanSettleApply.getTrueReduction() == 1) {
                     LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(businessSid);
                     if (null != reduction) {
@@ -756,6 +757,8 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                             baseMapper.updateBus(loanSettleApply.getBusVinSid(), "1");
                             //推送资方结清款到出纳代付款列表
                             pushBankSettlePrice(loanSettleApply);
+                            //设置认款月还为已转付
+                            updatePaymentStateByBusVinSid(loanSettleApply.getBusVinSid());
                         }
                     }
                 }
@@ -788,6 +791,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         List<FinUncollectedReceivablesDetailedJR> updateList = new ArrayList<>();
         //资方逾期利息应收、名义价应收、合同违约金应收、其他费用应收
         LoanSettleCompanyCost loanSettleCompanyCost = loanSettleCompanyCostService.selectByMainSid(loanSettleApply.getSid());
+        LoanSettleCompanyReduction companyReduction = loanSettleCompanyReductionService.selectByMainSid(loanSettleApply.getSid());
         LoanRepaymentPlanDetails planDetails = baseMapper.selectByBusVinSidAndDesc(loanSettleApply.getBusVinSid());
         String scheduleSid = planDetails.getScheduleSid();
         LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(scheduleSid);
@@ -867,18 +871,28 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 list.add(jr);
             }
         }
+        BigDecimal otherAmount = BigDecimal.ZERO;
+        BigDecimal otherAmountJM = BigDecimal.ZERO;
+        BigDecimal otherAmountMoney = BigDecimal.ZERO;
+        if (null != loanSettleCompanyCost.getCompanyOtherPrice()) {
+            otherAmount = loanSettleCompanyCost.getCompanyOtherPrice();
+        }
+        if (null != companyReduction) {
+            if (null != companyReduction.getOtherCost()) {
+                otherAmountJM = companyReduction.getOtherCost();
+            }
+        }
+        otherAmountMoney = otherAmount.subtract(otherAmountJM);
         FinUncollectedReceivablesDetailedJR jr4 = finUncollectedReceivablesDetailedJRFeign.getUnJrByPayCostTitleKeyAndBusSid("011", planDetailsSid).getData();
         if (null != jr4) {
-            if (null != loanSettleCompanyCost.getContractLiquidated()) {
-                jr4.setReveivableMoney(loanSettleCompanyCost.getContractLiquidated());
-                updateList.add(jr4);
-            }
+            jr4.setReveivableMoney(otherAmountMoney);
+            updateList.add(jr4);
         } else {
-            if (loanSettleCompanyCost.getCompanyOtherPrice().compareTo(BigDecimal.ZERO) > 0) {
+            if (otherAmountMoney.compareTo(BigDecimal.ZERO) > 0) {
                 //公司其他费用应收
                 FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
                 jr.setBusSid(planDetails.getSid());
-                jr.setReveivableMoney(loanSettleCompanyCost.getCompanyOtherPrice());
+                jr.setReveivableMoney(otherAmountMoney);
                 jr.setPayCostTitleKey("011");
                 jr.setPayCostTitleValue("其他费用");
                 jr.setOrgSidPath(planDetails.getOrgSidPath());
@@ -911,8 +925,6 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         String busVinSid = loanSettleApply.getBusVinSid();
         List<LoanRepaymentHistory> histories = new ArrayList<>();//还款记录
         List<FinSelectedReceivablesDetailed> selectList = new ArrayList<>();
-        List<LoanRepaymentPlanDetails> payments = new ArrayList<>(); //消减垫款金额列表
-        List<LoanRepaymentPlanDetails> yqlx = new ArrayList<>(); //消减逾期利息列表
         LoanRepaymentPlanDetails planDetails = baseMapper.selectByBusVinSidAndDesc(loanSettleApply.getBusVinSid());
         String scheduleSid = planDetails.getScheduleSid();
         LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(scheduleSid);
@@ -952,7 +964,6 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 for (PlanNoReturnMoney m : p) {
                     if (deposit.compareTo(BigDecimal.ZERO) > 0) {
                         BigDecimal money = new BigDecimal(m.getMoney());
-                        BigDecimal mm = BigDecimal.ZERO;
                         String sid = m.getSid();
                         String mSid = m.getMSid();
                         LoanRepaymentHistory history = new LoanRepaymentHistory();
@@ -969,26 +980,14 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                         history.setPlanDetailSid(sid);
                         history.setScheduleSid(mSid);
                         if (deposit.compareTo(money) >= 0) {
-                            mm = money;
                             history.setActualMoney(money);
                             histories.add(history);
                             deposit = deposit.subtract(money);
                         } else {
-                            mm = deposit;
                             history.setActualMoney(deposit);
                             histories.add(history);
                             deposit = BigDecimal.ZERO;
                         }
-                        LoanRepaymentPlanDetails pd = loanRepaymentPlanDetailsService.fetchBySid(sid);
-                        if (null != pd.getPaymentMoney()) {
-                            BigDecimal paymentMoney = pd.getPaymentMoney();
-                            if (mm.compareTo(paymentMoney) >= 0) {
-                                pd.setPaymentMoney(new BigDecimal("0"));
-                            } else {
-                                pd.setPaymentMoney(paymentMoney.subtract(mm));
-                            }
-                            payments.add(pd);
-                        }
                     }
                 }
             }
@@ -1001,21 +1000,17 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 for (PlanNoReturnMoney m : p) {
                     if (deposit.compareTo(BigDecimal.ZERO) > 0) {
                         BigDecimal money = new BigDecimal(m.getMoney());
-                        BigDecimal mm = BigDecimal.ZERO;
                         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.setVIN(planDetails.getVinNo());
+                        fin.setUseOrgSid(planDetails.getUseOrgSid());
                         fin.setReceivablesName("资方逾期利息");
                         if (deposit.compareTo(money) >= 0) {
-                            mm = money;
                             fin.setSubscriptionMoney(money);
                             deposit = deposit.subtract(money);
                         } else {
-                            mm = deposit;
                             fin.setSubscriptionMoney(deposit);
                             deposit = BigDecimal.ZERO;
                         }
@@ -1024,18 +1019,9 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                         fin.setAuditDate(DateUtil.today());
                         fin.setReceivablesSid(m.getJrSid());
                         fin.setKxState("01");
-                        fin.setUseOrgName(pd.getUseOrgName());
+                        fin.setUseOrgName(planDetails.getUseOrgName());
                         fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
                         selectList.add(fin);
-                        if (null != pd.getPaymentInterest()) {
-                            BigDecimal paymentInterest = pd.getPaymentInterest();
-                            if (mm.compareTo(paymentInterest) >= 0) {
-                                pd.setPaymentInterest(new BigDecimal("0"));
-                            } else {
-                                pd.setPaymentInterest(paymentInterest.subtract(mm));
-                            }
-                            yqlx.add(pd);
-                        }
                     }
                 }
             }
@@ -1192,12 +1178,6 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         if (histories.size() > 0 && !histories.isEmpty()) {
             loanRepaymentHistoryService.saveList(histories);
         }
-        if (payments.size() > 0 && !payments.isEmpty()) {
-            loanRepaymentPlanDetailsService.updateList(payments);
-        }
-        if (yqlx.size() > 0 && !yqlx.isEmpty()) {
-            loanRepaymentPlanDetailsService.updateList(yqlx);
-        }
         selectList.removeAll(Collections.singleton(null));
         if (selectList.size() > 0 && !selectList.isEmpty()) {
             ResultBean resultBean = finSelectedReceivablesDetailedFeign.saveAll(selectList);
@@ -1210,8 +1190,6 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         String busVinSid = loanSettleApply.getBusVinSid();
         List<LoanRepaymentHistory> histories = new ArrayList<>();//还款记录
         List<FinSelectedReceivablesDetailed> selectList = new ArrayList<>();
-        List<LoanRepaymentPlanDetails> payments = new ArrayList<>(); //消减垫款金额列表
-        List<LoanRepaymentPlanDetails> yqlx = new ArrayList<>(); //消减逾期利息列表
         LoanRepaymentPlanDetails planDetails = baseMapper.selectByBusVinSidAndDesc(loanSettleApply.getBusVinSid());
         String scheduleSid = planDetails.getScheduleSid();
         LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(scheduleSid);
@@ -1265,12 +1243,6 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 history.setScheduleSid(mSid);
                 history.setActualMoney(money);
                 histories.add(history);
-                LoanRepaymentPlanDetails pd = loanRepaymentPlanDetailsService.fetchBySid(sid);
-                if (null != pd.getPaymentMoney()) {
-                    BigDecimal paymentMoney = pd.getPaymentMoney();
-                    pd.setPaymentMoney(new BigDecimal("0"));
-                    payments.add(pd);
-                }
             }
         }
         //垫资方逾期利息
@@ -1280,12 +1252,11 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             for (PlanNoReturnMoney m : p2) {
                 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.setVIN(planDetails.getVinNo());
+                fin.setUseOrgSid(planDetails.getUseOrgSid());
                 fin.setReceivablesName("资方逾期利息");
                 fin.setSubscriptionMoney(money);
                 fin.setSubscriptionDate(DateUtil.today());
@@ -1293,14 +1264,9 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 fin.setAuditDate(DateUtil.today());
                 fin.setReceivablesSid(m.getJrSid());
                 fin.setKxState("01");
-                fin.setUseOrgName(pd.getUseOrgName());
+                fin.setUseOrgName(planDetails.getUseOrgName());
                 fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
                 selectList.add(fin);
-                if (null != pd.getPaymentInterest()) {
-                    BigDecimal paymentInterest = pd.getPaymentInterest();
-                    pd.setPaymentInterest(new BigDecimal("0"));
-                    yqlx.add(pd);
-                }
             }
         }
         //资方逾期利息
@@ -1395,22 +1361,68 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
             selectList.add(fin);
         }
-        if (histories.size() > 0 && !histories.isEmpty()) {
-            loanRepaymentHistoryService.saveList(histories);
+        //资方退还垫款应收
+        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));
+        Set<String> set = new HashSet<>();
+        if (!ps.isEmpty() && ps.size() > 0) {
+            for (LoanRepaymentPlanDetails pp : ps) {
+                if (pp.getPaymentMoney() != null) {
+                    if (pp.getPaymentMoney().compareTo(BigDecimal.ZERO) == 0) {
+
+                    } else {
+                        set.add(pp.getSid());
+                    }
+                }
+                if (pp.getPaymentInterest() != null) {
+                    if (pp.getPaymentInterest().compareTo(BigDecimal.ZERO) == 0) {
+
+                    } else {
+                        set.add(pp.getSid());
+                    }
+                }
+            }
         }
-        if (payments.size() > 0 && !payments.isEmpty()) {
-            loanRepaymentPlanDetailsService.updateList(payments);
+        List<String> sids = new ArrayList<>(set);
+        if (!sids.isEmpty() && sids.size() > 0) {
+            loanRepaymentPlanDetailsService.updatePaymentMoneyBySids(sids);
         }
-        if (yqlx.size() > 0 && !yqlx.isEmpty()) {
-            loanRepaymentPlanDetailsService.updateList(yqlx);
+        if (histories.size() > 0 && !histories.isEmpty()) {
+            loanRepaymentHistoryService.saveList(histories);
         }
         selectList.removeAll(Collections.singleton(null));
         if (selectList.size() > 0 && !selectList.isEmpty()) {
             ResultBean resultBean = finSelectedReceivablesDetailedFeign.saveAll(selectList);
         }
     }
+
     //--------------------资方结清款到出纳代付款列表------------------
-    private void  pushBankSettlePrice(LoanSettleApply loanSettleApply) {
+    private void pushBankSettlePrice(LoanSettleApply loanSettleApply) {
         if (StringUtils.isBlank(loanSettleApply.getBusSid())) {
             LoanSettleBankCost bankCost = loanSettleBankCostService.selectByMainSid(loanSettleApply.getSid());
             if (null != bankCost) {
@@ -2200,15 +2212,47 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         settleApplyAppVo.setCreateTime(DateUtil.format(loanSettleApply.getCreateTime(), "yyyy-MM-dd"));
         LoanSettleBankCost loanSettleBankCost = loanSettleBankCostService.selectByMainSid(sid);
         if (loanSettleBankCost != null) {
-            settleApplyAppVo.setPrice(loanSettleBankCost.getPrice().toString());
-            settleApplyAppVo.setCurrentNotDuePriceBank(loanSettleBankCost.getCurrentNotDuePrice().toString());
-            settleApplyAppVo.setNotDuePriceBank(loanSettleBankCost.getNotDuePrice().toString());
-            settleApplyAppVo.setBankInterest(loanSettleBankCost.getBankInterest().toString());
-            settleApplyAppVo.setBankNominalPrice(loanSettleBankCost.getBankNominalPrice().toString());
-            settleApplyAppVo.setBankContractLiquidated(loanSettleBankCost.getBankContractLiquidated().toString());
-            settleApplyAppVo.setBankOtherReceivable(loanSettleBankCost.getBankOtherReceivable().toString());
-            settleApplyAppVo.setOtherReceivableRemarks(loanSettleBankCost.getOtherReceivableRemarks());
-            settleApplyAppVo.setBankSettlePrice(loanSettleBankCost.getBankSettlePrice().toString());
+            if (StringUtils.isNotBlank(loanSettleBankCost.getAccountName())) {
+                settleApplyAppVo.setAccountName(loanSettleBankCost.getAccountName());
+            }
+            if (StringUtils.isNotBlank(loanSettleBankCost.getBankAccount())) {
+                settleApplyAppVo.setBankAccount(loanSettleBankCost.getBankAccount());
+            }
+            if (loanSettleBankCost.getTopping() == 1) {
+                settleApplyAppVo.setTopping("是");
+            } else if (loanSettleBankCost.getTopping() == 0) {
+                settleApplyAppVo.setTopping("否");
+            }
+            if (null != loanSettleBankCost.getLoanDeposit()) {
+                settleApplyAppVo.setLoanDepositBank(loanSettleBankCost.getLoanDeposit().toString());
+            }
+            if (null != loanSettleBankCost.getPrice()) {
+                settleApplyAppVo.setPrice(loanSettleBankCost.getPrice().toString());
+            }
+            if (null != loanSettleBankCost.getCurrentNotDuePrice()) {
+                settleApplyAppVo.setCurrentNotDuePriceBank(loanSettleBankCost.getCurrentNotDuePrice().toString());
+            }
+            if (null != loanSettleBankCost.getNotDuePrice()) {
+                settleApplyAppVo.setNotDuePriceBank(loanSettleBankCost.getNotDuePrice().toString());
+            }
+            if (null != loanSettleBankCost.getBankInterest()) {
+                settleApplyAppVo.setBankInterest(loanSettleBankCost.getBankInterest().toString());
+            }
+            if (null != loanSettleBankCost.getBankNominalPrice()) {
+                settleApplyAppVo.setBankNominalPrice(loanSettleBankCost.getBankNominalPrice().toString());
+            }
+            if (null != loanSettleBankCost.getBankContractLiquidated()) {
+                settleApplyAppVo.setBankContractLiquidated(loanSettleBankCost.getBankContractLiquidated().toString());
+            }
+            if (null != loanSettleBankCost.getBankOtherReceivable()) {
+                settleApplyAppVo.setBankOtherReceivable(loanSettleBankCost.getBankOtherReceivable().toString());
+            }
+            if (StringUtils.isNotBlank(loanSettleBankCost.getOtherReceivableRemarks())) {
+                settleApplyAppVo.setOtherReceivableRemarks(loanSettleBankCost.getOtherReceivableRemarks());
+            }
+            if (null != loanSettleBankCost.getBankSettlePrice()) {
+                settleApplyAppVo.setBankSettlePrice(loanSettleBankCost.getBankSettlePrice().toString());
+            }
             if (StringUtils.isNotBlank(loanSettleBankCost.getFiles())) {
                 List<String> fileList = Arrays.asList(loanSettleBankCost.getFiles().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
                 fileList.removeAll(Collections.singleton(null));
@@ -2258,21 +2302,35 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             if (loanSettleCompanyCost.getFundAll() != null) {
                 settleApplyAppVo.setFundAll(loanSettleCompanyCost.getFundAll().toString());
             }
-            settleApplyAppVo.setOtherCostRemarks(loanSettleCompanyCost.getOtherCostRemarks());
+            if (StringUtils.isNotBlank(loanSettleCompanyCost.getOtherCostRemarks())) {
+                settleApplyAppVo.setOtherCostRemarks(loanSettleCompanyCost.getOtherCostRemarks());
+            }
 
 
         }
         LoanSettleCompanyReduction loanSettleCompanyReduction = loanSettleCompanyReductionService.selectByMainSid(sid);
         if (loanSettleCompanyReduction != null) {
             if (loanSettleApply.getTrueReduction() == 0) {//未勾选
-                settleApplyAppVo.setProfit(loanSettleCompanyReduction.getProfit().toString());
+                if (null != loanSettleCompanyReduction.getProfit()) {
+                    settleApplyAppVo.setProfit(loanSettleCompanyReduction.getProfit().toString());
+                }
                 settleApplyAppVo.setTrueReduction(false);
             } else {
-                settleApplyAppVo.setFundPenalty(loanSettleCompanyReduction.getFundPenalty().toString());
-                settleApplyAppVo.setDepositPenalty(loanSettleCompanyReduction.getDepositPenalty().toString());
-                settleApplyAppVo.setOtherCost(loanSettleCompanyReduction.getOtherCost().toString());
-                settleApplyAppVo.setAmountTo(loanSettleCompanyReduction.getAmountTo().toString());
-                settleApplyAppVo.setProfit(loanSettleCompanyReduction.getProfit().toString());
+                if (null != loanSettleCompanyReduction.getFundPenalty()) {
+                    settleApplyAppVo.setFundPenalty(loanSettleCompanyReduction.getFundPenalty().toString());
+                }
+                if (null != loanSettleCompanyReduction.getDepositPenalty()) {
+                    settleApplyAppVo.setDepositPenalty(loanSettleCompanyReduction.getDepositPenalty().toString());
+                }
+                if (null != loanSettleCompanyReduction.getOtherCost()) {
+                    settleApplyAppVo.setOtherCost(loanSettleCompanyReduction.getOtherCost().toString());
+                }
+                if (null != loanSettleCompanyReduction.getAmountTo()) {
+                    settleApplyAppVo.setAmountTo(loanSettleCompanyReduction.getAmountTo().toString());
+                }
+                if (null != loanSettleCompanyReduction.getProfit()) {
+                    settleApplyAppVo.setProfit(loanSettleCompanyReduction.getProfit().toString());
+                }
                 settleApplyAppVo.setTrueReduction(true);
             }
         }
@@ -2313,7 +2371,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
                 qw.eq("bs.useOrgSid", useOrgSid);
             }
-            qw.apply("bv.settleState = '0'OR (bv.settleState = '2' AND date_format (bv.settleApplyDate,'%Y-%m-%d') < CURDATE())");
+            qw.apply("bv.settleState = '0'OR (bv.settleState = '3' AND date_format (bv.settleApplyDate,'%Y-%m-%d') < CURDATE())");
             //回购状态，回购申请
             if (StringUtils.isNotBlank(query.getType())) {
                 if (query.getType().equals("1")) {
@@ -2349,6 +2407,8 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         baseMapper.updateBus(loanSettleApply.getBusVinSid(), "1");
         //推送资方结清款到出纳代付款列表
         pushBankSettlePrice(loanSettleApply);
+        //设置认款月还为已转付
+        updatePaymentStateByBusVinSid(loanSettleApply.getBusVinSid());
         return rb.success();
     }
 
@@ -2361,9 +2421,9 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date closeDate = loanSettleApply.getCloseDate();
         String formatDate = sdf.format(closeDate);
-        String jMoney = baseMapper.selJrMoneyByBusVinSidAndCloseDate(busVinSid,formatDate);
+        String jMoney = baseMapper.selJrMoneyByBusVinSidAndCloseDate(busVinSid, formatDate);
         jrMoney = new BigDecimal(jMoney);
-        String dMoney = baseMapper.selDueMoneyByBusVinSidAndCloseDate(busVinSid,formatDate);
+        String dMoney = baseMapper.selDueMoneyByBusVinSidAndCloseDate(busVinSid, formatDate);
         dueMoney = new BigDecimal(dMoney);
         sumMoney = jrMoney.add(dueMoney);
         LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(loanSettleApply.getSid());
@@ -2377,4 +2437,8 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         }
         return isSettle;
     }
+
+    public void updatePaymentStateByBusVinSid(String busVinSid) {
+        baseMapper.updatePaymentStateByBusVinSid(busVinSid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlevehicle/LoanSettleVehicleMapper.xml

@@ -8,22 +8,26 @@
     </select>
 
     <select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loansettlevehicle.LoanSettleVehicleVo">
-        select lv.sid,
-               lv.typeStateValue,
-               lv.useOrgName,
-               lv.createDept,
-               lv.loanContractNo,
-               lv.vinNo,
-               lv.busVinSid,
-               lv.vehMark,
-               lv.loanName,
-               lv.peroid,
-               lv.settingDate,
-               lv.bankSettlePrice,
-               lv.settleAll,
-               lv.amountTo,
-               lv.profit
-        from loan_settle_vehicle lv
+        SELECT
+        lv.sid,
+        lv.typeStateValue,
+        lv.useOrgName,
+        lv.createDept,
+        lv.loanContractNo,
+        lv.vinNo,
+        lv.busVinSid,
+        lv.vehMark,
+        lv.loanName,
+        lv.settingDate,
+        b.bankSettlePrice,
+        c.settleAll,
+        r.amountTo,
+        r.profit
+        FROM
+        loan_settle_apply lv
+        LEFT JOIN loan_settle_bank_cost as b ON lv.sid = b.mainSid
+        LEFT JOIN loan_settle_company_cost as c ON lv.sid = c.mainSid
+        LEFT JOIN loan_settle_company_reduction as r ON lv.sid = r.mainSid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -38,4 +42,4 @@
         order by period desc
         limit 1
     </select>
-</mapper>
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlevehicle/LoanSettleVehicleService.java

@@ -127,6 +127,7 @@ public class LoanSettleVehicleService extends MybatisBaseService<LoanSettleVehic
                     return p;
                 }
             }
+            qw.eq("lv.state", 1);
         }
         IPage<LoanSettleVehicle> page = PagerUtil.queryToPage(pagerQuery);
         IPage<LoanSettleVehicleVo> pagging = baseMapper.selectPageVo(page, qw);

anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js

@@ -49,7 +49,7 @@ export default {
   // 删除
   delete: function(params) {
     return request({
-      url: '/scm/v1/scmvehrebate/delBySids',
+      url: '/scm/v1/scmvehrebatecheckapply/delBySids',
       method: 'DELETE',
       data: params,
       headers: { 'Content-Type': 'application/json' }

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue

@@ -126,7 +126,7 @@ import ButtonBar from '@/components/ButtonBar'
 import { brandDown, getOrgSidByPath } from '@/api/cheliang/dictcommons'
 import bicyclerebatecheckAdd from './bicyclerebatecheckAdd'
 import bicyclerebatecheckInfo from './bicyclerebatecheckInfo'
-import {getStorage} from "@/utils/auth";
+import { getStorage } from '@/utils/auth'
 
 export default {
   name: 'BicycleRebateCheck',

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue

@@ -322,13 +322,14 @@ export default {
           let v = 0
           for (var j in this.formobj.scmWhenVehrebateCheckapplydetailDetails) {
             if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].rebateTypeValue === cval.rebateTypeValue) {
-              this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].num = parseInt(this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].num) + parseInt(1)
-              this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].withRebate = parseInt(this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].withRebate) + parseInt(cval.withRebate)
-              this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].uploadMoney = parseInt(this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].uploadMoney) + parseInt(cval.uploadMoney)
-              this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].stayDetermineMoney = parseInt(this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].stayDetermineMoney) + parseInt(cval.stayDetermineMoney)
-              this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].adjustmentMoney = parseInt(this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].adjustmentMoney) + parseInt(cval.adjustmentMoney)
-              this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].money = parseInt(this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].money) + parseInt(cval.money)
+              this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].num = parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].num) + parseFloat(1)
+              this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].withRebate = parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].withRebate !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)
+              this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].uploadMoney = parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].uploadMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].uploadMoney : 0) + parseFloat(cval.uploadMoney !== '' ? cval.uploadMoney : 0)
+              this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].stayDetermineMoney = parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].stayDetermineMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].stayDetermineMoney : 0) + parseFloat(cval.stayDetermineMoney !== '' ? cval.stayDetermineMoney : 0)
+              this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].adjustmentMoney = parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].adjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].adjustmentMoney : 0) + parseFloat(cval.adjustmentMoney !== '' ? cval.adjustmentMoney : 0)
+              this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].money = parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].money !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].money : 0) + parseFloat(cval.money !== '' ? cval.money : 0)
               this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].vehRebateSids.push(cval.sid)
+              this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].vehRebateSid = this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].vehRebateSids.join(',')
               v = 1
               break
             }
@@ -345,6 +346,7 @@ export default {
               stayDetermineMoney: cval.stayDetermineMoney,
               adjustmentMoney: cval.adjustmentMoney,
               money: cval.money,
+              vehRebateSid: cval.sid,
               vehRebateSids: [cval.sid],
               sid: '',
               mainSid: ''
@@ -361,13 +363,13 @@ export default {
           let v = 0
           for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) {
             if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === bval.withholdingDate) {
-              this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingAmount = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingAmount) + parseInt(1)
-              this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadAmount = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadAmount) + parseInt(1)
-              this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate) + parseInt(bval.withRebate)
-              this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney) + parseInt(bval.uploadMoney)
-              this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney) + parseInt(bval.stayDetermineMoney)
-              this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney) + parseInt(bval.adjustmentMoney)
-              this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money) + parseInt(bval.money)
+              this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingAmount = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingAmount !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingAmount : 0) + parseFloat(1)
+              this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadAmount = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadAmount !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadAmount : 0) + parseFloat(1)
+              this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(bval.withRebate !== '' ? bval.withRebate : 0)
+              this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney : 0) + parseFloat(bval.uploadMoney !== '' ? bval.uploadMoney : 0)
+              this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(bval.stayDetermineMoney !== '' ? bval.stayDetermineMoney : 0)
+              this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(bval.adjustmentMoney !== '' ? bval.adjustmentMoney : 0)
+              this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money : 0) + parseFloat(bval.money !== '' ? bval.money : 0)
               this.formobj.scmLastVehrebateCheckapplydetailDetails[l].vehRebateSids.push(bval.sid)
               v = 1
               break
@@ -410,13 +412,14 @@ export default {
           let v = 0
           for (var j in aa) {
             if (aa[j].rebateTypeValue === cval.rebateTypeValue) {
-              aa[j].num = parseInt(aa[j].num) + parseInt(1)
-              aa[j].withRebate = parseInt(aa[j].withRebate) + parseInt(cval.withRebate)
-              aa[j].uploadMoney = parseInt(aa[j].uploadMoney) + parseInt(cval.uploadMoney)
-              aa[j].stayDetermineMoney = parseInt(aa[j].stayDetermineMoney) + parseInt(cval.stayDetermineMoney)
-              aa[j].adjustmentMoney = parseInt(aa[j].adjustmentMoney) + parseInt(cval.adjustmentMoney)
-              aa[j].money = parseInt(aa[j].money) + parseInt(cval.money)
+              aa[j].num = parseFloat(aa[j].num) + parseFloat(1)
+              aa[j].withRebate = parseFloat(aa[j].withRebate !== '' ? aa[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)
+              aa[j].uploadMoney = parseFloat(aa[j].uploadMoney !== '' ? aa[j].uploadMoney : 0) + parseFloat(cval.uploadMoney !== '' ? cval.uploadMoney : 0)
+              aa[j].stayDetermineMoney = parseFloat(aa[j].stayDetermineMoney !== '' ? aa[j].stayDetermineMoney : 0) + parseFloat(cval.stayDetermineMoney !== '' ? cval.stayDetermineMoney : 0)
+              aa[j].adjustmentMoney = parseFloat(aa[j].adjustmentMoney !== '' ? aa[j].adjustmentMoney : 0) + parseFloat(cval.adjustmentMoney !== '' ? cval.adjustmentMoney : 0)
+              aa[j].money = parseFloat(aa[j].money !== '' ? aa[j].money : 0) + parseFloat(cval.money !== '' ? cval.money : 0)
               aa[j].vehRebateSids.push(cval.sid)
+              aa[j].vehRebateSid = aa[j].vehRebateSids.join(',')
               v = 1
               break
             }
@@ -433,6 +436,7 @@ export default {
               stayDetermineMoney: cval.stayDetermineMoney,
               adjustmentMoney: cval.adjustmentMoney,
               money: cval.money,
+              vehRebateSid: cval.sid,
               vehRebateSids: [cval.sid],
               sid: '',
               mainSid: ''
@@ -452,6 +456,7 @@ export default {
             this.formobj.scmWhenVehrebateCheckapplydetailDetails[k].adjustmentMoney = aa[0].adjustmentMoney
             this.formobj.scmWhenVehrebateCheckapplydetailDetails[k].money = aa[0].money
             this.formobj.scmWhenVehrebateCheckapplydetailDetails[k].vehRebateSids = aa[0].vehRebateSids
+            this.formobj.scmWhenVehrebateCheckapplydetailDetails[k].vehRebateSid = aa[0].vehRebateSid
             break
           }
         }

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue

@@ -422,9 +422,6 @@ export default {
         case 'doImport':
           this.doImport()
           break
-        case 'doDel':
-          this.doDel()
-          break
         case 'doClose':
           this.doClose()
           break
@@ -654,35 +651,6 @@ export default {
       this.formobj.secondaryUploadMoney = 0
       this.formobj.surplusRebate = parseInt(row.estimateRebate) - parseInt(row.uploadMoney)
     },
-    doDel() {
-      if (this.sids.length === 0) {
-        this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
-        return
-      }
-      const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
-      this.$confirm(tip, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        const loading = this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        })
-        req.delete(this.sids).then(resp => {
-          if (resp.success) {
-            this.$message({ type: 'success', message: resp.msg, showClose: true })
-          }
-          this.getList()
-          loading.close()
-        }).catch(e => {
-          loading.close()
-        })
-      }).catch(() => {
-      })
-    },
     resetState() {
       this.viewState = 1
     },

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

@@ -130,4 +130,12 @@ public class SettleApplyAppVos {
     @ApiModelProperty("截止当前资金占用费")
     private String fundAll;
 
+    @ApiModelProperty("资方贷款保证金")
+    private String loanDepositBank;
+    @ApiModelProperty("是否抵顶")
+    private String topping;
+    @ApiModelProperty("资方收款账号")
+    private String bankAccount;
+    @ApiModelProperty("资方收款账户")
+    private String accountName;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/AsServiceItemApplyDetailsVo.java

@@ -68,6 +68,7 @@ public class AsServiceItemApplyDetailsVo implements Vo {
     private String taskId;
     @ApiModelProperty("实例id")
     private String instanceId;
+    private String procInsId;
     @ApiModelProperty("创建组织sid分公司")
     private String createOrgSid; // 创建组织sid
     @ApiModelProperty("使用组织sid分公司")
@@ -80,6 +81,7 @@ public class AsServiceItemApplyDetailsVo implements Vo {
     private String remarks; // 备注
     @ApiModelProperty("附件")
     private List<FileUrlQuery> file = new ArrayList<>(); // 附件
+    private List<String> file2 = new ArrayList<>(); // 附件
     @ApiModelProperty("维修项目列表")
     private List<SitemsVo> sitemsVos; // 维修项目列表
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/SitemsVo.java

@@ -36,7 +36,9 @@ public class SitemsVo {
     private String remarks;
     @ApiModelProperty("是否为预约项目，直接返回是否无需转换")
     private String isReserve;
+    private String isReserve2;
     @ApiModelProperty("是否为洗车项目，直接返回是否无需转换")
     private String isClean;
+    private String isClean2;
 
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyRest.java

@@ -100,4 +100,12 @@ public class AsServiceItemApplyRest  {
 		AsServiceItemApplyDetailsVo vo = asServiceItemApplyService.applyInit(sids);
 		return rb.success().setData(vo);
 	}
+
+	@ApiOperation("app详情")
+	@GetMapping("/fetchDetailsBySid2/{sid}")
+	public ResultBean<AsServiceItemApplyDetailsVo> fetchDetailsBySid2(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		AsServiceItemApplyDetailsVo vo = asServiceItemApplyService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyService.java

@@ -251,16 +251,28 @@ public class AsServiceItemApplyService extends MybatisBaseService<AsServiceItemA
             BeanUtil.copyProperties(entity, vo);
             if (StringUtils.isNotBlank(entity.getProcInstId())) {
                 vo.setInstanceId(entity.getProcInstId());
+                vo.setProcInsId(entity.getProcInstId());
             }
             vo.setCreateTime(DateUtil.formatDate(entity.getCreateTime()));
             List<AsServiceItemApplyRecord> records = asServiceItemApplyRecordService.selByMainSid(sid);
             List<SitemsVo> sitemsVos = new ArrayList<>();
+            List<String> file2 = new ArrayList<>();
             if (!records.isEmpty()) {
                 for (AsServiceItemApplyRecord record : records) {
                     SitemsVo s = new SitemsVo();
                     AsServiceItem item = asServiceItemService.fetchBySid(record.getSitemSid());
                     BeanUtil.copyProperties(item, s, "id", "sid");
                     s.setSitemSid(item.getSid());
+                    if (item.getIsClean().intValue() == 0) {
+                        s.setIsClean2("否");
+                    } else if (item.getIsClean().intValue() == 1) {
+                        s.setIsClean2("是");
+                    }
+                    if (item.getIsReserve().intValue() == 0) {
+                        s.setIsReserve2("否");
+                    } else if (item.getIsReserve().intValue() == 1) {
+                        s.setIsReserve2("是");
+                    }
                     sitemsVos.add(s);
                 }
             }
@@ -273,9 +285,11 @@ public class AsServiceItemApplyService extends MybatisBaseService<AsServiceItemA
                     String url = fileUploadComponent.getUrlPrefix() + asAppendix.getFilePath();
                     fileUrlQuery.setUrl(url);
                     file.add(fileUrlQuery);
+                    file2.add(url);
                 }
             }
             vo.setFile(file);
+            vo.setFile2(file2);
         }
         return vo;
     }