导入贷款保证金接口

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java

@@ -97,6 +97,12 @@ public interface LoanRepaymentScheduleFeign {
     public ResultBean importSleepHistoryData(@RequestParam("userSid") String userSid);
 
 
+    @ApiOperation(value = "导入历史数据贷款保证金")
+    @PostMapping("/importBondAmountsData")
+    public ResultBean importBondAmountsData(
+            @RequestParam(value = "file") MultipartFile file, HttpServletRequest request) throws IOException;
+
+
     @ApiOperation("根据还款计划明细返回资方sid")
     @GetMapping("/returnBankOrOtherBankByPlanSid")
     @ResponseBody

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java

@@ -88,6 +88,11 @@ public class LoanRepaymentScheduleFeignFallback implements LoanRepaymentSchedule
         return null;
     }
 
+    @Override
+    public ResultBean importBondAmountsData(MultipartFile file, HttpServletRequest request) throws IOException {
+        return null;
+    }
+
     @Override
     public ResultBean<String> returnBankOrOtherBankByPlanSid(String planSid) {
         return null;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/ImportBondAmountsUpdate.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.riskcenter.api.loanrepaymentschedule.historyData;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/9/6 15:43
+ */
+@Data
+public class ImportBondAmountsUpdate {
+    private String sid;
+    private String bondAmounts;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/ImportBondAmountsVo.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.riskcenter.api.loanrepaymentschedule.historyData;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/9/6 14:48
+ */
+@Data
+public class ImportBondAmountsVo {
+    private String vinNo;
+    private String bondAmounts;
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.java

@@ -7,11 +7,13 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.LoanRepaymentPlanDetailsExportVo;
 import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
 import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.*;
+import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.historyData.ImportBondAmountsUpdate;
 import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformation;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -54,4 +56,8 @@ public interface LoanRepaymentScheduleMapper extends BaseMapper<LoanRepaymentSch
     LoanRepaymentSchedule selByOtherBankContractNoForSleepData(@Param("bankContractNo") String bankContractNo,@Param("vinNo") String vinNo);
 
     int updateIsEnable(@Param("list") List<String> list);
+
+    String selSidByVinNo(@Param("vinNo") String vinNo);
+
+    void updateBoundsBySid(@Param("list") List<ImportBondAmountsUpdate> list);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml

@@ -15,7 +15,7 @@
             #{item.mainLastRepay},#{item.otherPeriod},#{item.otherBankNo},#{item.otherRepayDate},#{item.otherFirstRepay},#{item.otherMidRepay},
             #{item.otherLastRepay},#{item.isOtherPolicy},#{item.sameBank},#{item.cwDeptNo},#{item.isDifferent},#{item.importTiredMoney},
             #{item.importPaymentMoney},#{item.importInterest},#{item.importFund},#{item.orgSidPath},#{item.bankSid},#{item.otherBankSid},#{item.bondAmounts}
-             )
+            )
         </foreach>
     </insert>
     <update id="updateIsEnable">
@@ -26,6 +26,24 @@
             #{item}
         </foreach>
     </update>
+    <update id="updateBoundsBySid" parameterType="java.util.List">
+        update loan_repayment_schedule
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="bondAmounts =case" suffix="end,">
+                <foreach collection="list" item="item" index="index">
+                    <if test="item.bondAmounts !=null and item.bondAmounts != ''">
+                        when sid=#{item.sid} then #{item.bondAmounts}
+                    </if>
+                </foreach>
+            </trim>
+        </trim>
+        where sid in
+        <foreach collection="list" index="index" item="item"
+                 separator="," open="(" close=")">
+            #{item.sid}
+        </foreach>
+    </update>
+
     <select id="selectByContractSid"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule">
         select *
@@ -73,8 +91,8 @@
                         lrs.salesOrderSid,
                         lrpd.busVinSid
         FROM loan_repayment_schedule lrs
-                     LEFT JOIN loan_repayment_plan_details lrpd
-                ON lrpd.scheduleSid = lrs.sid
+                 LEFT JOIN loan_repayment_plan_details lrpd
+                           ON lrpd.scheduleSid = lrs.sid
         WHERE lrpd.bankContractNo = #{bankContractNo}
     </select>
     <select id="selByLoanContractSid"
@@ -102,29 +120,29 @@
     </select>
     <select id="selPlansInfoByMainSidAndVinNo"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymentschedule.MoneyAndPeriodVo">
-        SELECT
-            period,
-            date_format(dueDate, '%Y-%m' ) as dueDate,
-            dueMoney,
-            bankName
+        SELECT period,
+               date_format(dueDate, '%Y-%m') as dueDate,
+               dueMoney,
+               bankName
         FROM loan_repayment_plan_details
-        WHERE
-            scheduleSid = #{mainSid} AND policyOrOther = #{mainOrOther} AND vinNo LIKE CONCAT( '%', #{vinNo}, '%' )
+        WHERE scheduleSid = #{mainSid}
+          AND policyOrOther = #{mainOrOther}
+          AND vinNo LIKE CONCAT('%', #{vinNo}, '%')
         ORDER BY period ASC
     </select>
     <select id="selSumAmountDueMoney" resultType="java.lang.String">
-        SELECT
-            IFNULL(SUM(dueMoney),0)
+        SELECT IFNULL(SUM(dueMoney), 0)
         FROM loan_repayment_plan_details
-        WHERE
-            scheduleSid = #{mainSid} AND policyOrOther = #{mainOrOther} AND vinNo LIKE CONCAT( '%', #{vinNo}, '%' )
+        WHERE scheduleSid = #{mainSid}
+          AND policyOrOther = #{mainOrOther}
+          AND vinNo LIKE CONCAT('%', #{vinNo}, '%')
     </select>
     <select id="selSumAmountDueMoneyByBusVinSid" resultType="java.lang.String">
-        SELECT
-            IFNULL(SUM(dueMoney),0)
+        SELECT IFNULL(SUM(dueMoney), 0)
         FROM loan_repayment_plan_details
-        WHERE
-            scheduleSid = #{mainSid} AND policyOrOther = #{mainOrOther} AND busVinSid =#{busVinSid}
+        WHERE scheduleSid = #{mainSid}
+          AND policyOrOther = #{mainOrOther}
+          AND busVinSid = #{busVinSid}
     </select>
     <select id="selPlansExcel"
             resultType="com.yxt.anrui.buscenter.api.bussalesorderloancontract.LoanRepaymentPlanDetailsExportVo">
@@ -166,23 +184,30 @@
         </foreach>
     </select>
     <select id="selMoneyAndVin" resultType="com.yxt.anrui.riskcenter.api.loanrepaymentschedule.DetailsVehVo">
-        SELECT
-            SUM( dueMoney ) as money,
-            vinNo,
-            busVinSid
-        FROM
-            loan_repayment_plan_details AS p
-        WHERE
-            p.scheduleSid = #{sid}
-        GROUP BY
-            p.vinNo
+        SELECT SUM(dueMoney) as money,
+               vinNo,
+               busVinSid
+        FROM loan_repayment_plan_details AS p
+        WHERE p.scheduleSid = #{sid}
+        GROUP BY p.vinNo
     </select>
     <select id="selByBankContractNoForSleepData"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule">
-        select * from loan_repayment_schedule where bankContractNo =#{bankContractNo} and vinNo =#{vinNo}
+        select *
+        from loan_repayment_schedule
+        where bankContractNo = #{bankContractNo}
+          and vinNo = #{vinNo}
     </select>
     <select id="selByOtherBankContractNoForSleepData"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule">
-        select * from loan_repayment_schedule where otherBankNo =#{bankContractNo} and vinNo =#{vinNo}
+        select *
+        from loan_repayment_schedule
+        where otherBankNo = #{bankContractNo}
+          and vinNo = #{vinNo}
+    </select>
+    <select id="selSidByVinNo" resultType="java.lang.String">
+        SELECT p.scheduleSid
+        FROM loan_repayment_plan_details AS p
+        WHERE p.vinNo LIKE CONCAT('%', #{vinNo}, '%') LIMIT 1
     </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java

@@ -106,6 +106,11 @@ public class LoanRepaymentScheduleRest implements LoanRepaymentScheduleFeign {
         return loanRepaymentScheduleService.importSleepHistoryData(userSid);
     }
 
+    @Override
+    public ResultBean importBondAmountsData(MultipartFile file, HttpServletRequest request) throws IOException {
+        return loanRepaymentScheduleService.importBondAmountsData(file,request);
+    }
+
     @Override
     public ResultBean<String> returnBankOrOtherBankByPlanSid(String planSid) {
         return loanRepaymentScheduleService.returnBankOrOtherBankByPlanSid(planSid);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -42,10 +42,7 @@ import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsDto;
 import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.*;
-import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.historyData.HistoryDataImportVo;
-import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.historyData.ImportSleepData;
-import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.historyData.ReturnMsg;
-import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.historyData.ReturnSleepMsp;
+import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.historyData.*;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
 import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy;
@@ -72,6 +69,7 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.messagecenter.api.message.MessageFeign;
 import com.yxt.messagecenter.api.message.PushMessageQuery;
 import com.yxt.messagecenter.api.message.PushSmsDto;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.time.DateUtils;
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -159,6 +157,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
     private FinUncollectedReceivablesDetailedJRFeign finUncollectedReceivablesDetailedJRFeign;
     @Autowired
     private LoanPushFundHistoryService loanPushFundHistoryService;
+
     /**
      * 根据销售订单SID生成还款计划表回显
      *
@@ -368,6 +367,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         LoanRepaymentSchedule loanRepaymentSchedule = baseMapper.selectByContractSid(dto.getSalesOrderSid());
         String orderSid = "";
         String scheduleSid = "";
+        BigDecimal bondAmounts = BigDecimal.ZERO;//贷款保证金
         BusSalesOrderLoancontractDetailsVo loancontract = busSalesOrderLoancontractFeign.fetchDetailsBySid(dto.getSalesOrderSid()).getData();
         if (null != loancontract) {
             if (StringUtils.isNotBlank(loancontract.getSalesOrderSid())) {
@@ -378,6 +378,9 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsService.selectDetailss(orderSid);
         if (solutionsDetailsVoResultBean.getData() != null) {
             BeanUtil.copyProperties(solutionsDetailsVoResultBean.getData(), solutionsDetailsssVo);
+            if (StringUtils.isNotBlank(solutionsDetailsVoResultBean.getData().getBondAmounts())) {
+                bondAmounts = new BigDecimal(solutionsDetailsVoResultBean.getData().getBondAmounts());
+            }
         }
         if (StringUtils.isBlank(dto.getMainRepayDate())) {
             return rb.setMsg("请选择主金融产品首期还款日！");
@@ -460,6 +463,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
             BeanUtil.copyProperties(dto, loanRepaymentSchedule, "id", "sid");
             loanRepaymentSchedule.setLoanContractSid(dto.getSalesOrderSid());
             loanRepaymentSchedule.setSalesOrderSid(orderSid);
+            loanRepaymentSchedule.setBondAmounts(bondAmounts);
             if (StringUtils.isNotBlank(dto.getOtherBankNo())) {
                 loanRepaymentSchedule.setOtherBankNo(dto.getOtherBankNo());
             }
@@ -1224,6 +1228,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
             BeanUtil.copyProperties(dto, entity, "id", "sid");
             entity.setLoanContractSid(dto.getSalesOrderSid());
             entity.setSalesOrderSid(orderSid);
+            entity.setBondAmounts(bondAmounts);
             if (StringUtils.isNotBlank(dto.getUserSid())) {
                 entity.setCreateBySid(dto.getUserSid());
             }
@@ -5199,10 +5204,10 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                             contracts.add(bsl);
                         }
                     }
-                        vehicleData.setTemporaryNo(borrowerNo);
-                        vehicleData.setBorrowerSid(borrowerSid);
-                        vehicleData.setLoanContractSid(loanContractSid);
-                        updateVehicles.add(vehicleData);
+                    vehicleData.setTemporaryNo(borrowerNo);
+                    vehicleData.setBorrowerSid(borrowerSid);
+                    vehicleData.setLoanContractSid(loanContractSid);
+                    updateVehicles.add(vehicleData);
                 } else {
                     //生成销售订单贷款人表
                     BusSalesOrderBorrower busSalesOrderBorrower = new BusSalesOrderBorrower();
@@ -5598,6 +5603,117 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         return returnList;
     }
 
+    public ResultBean importBondAmountsData(MultipartFile file, HttpServletRequest request) {
+        ResultBean rb = ResultBean.fireFail();
+        try {
+            String temp = request.getSession().getServletContext().getRealPath(File.separator) + "temp";// 临时目录
+            File tempFile = new File(temp);
+            if (!tempFile.exists()) {
+                tempFile.mkdirs();
+            }
+            String fileName = file.getOriginalFilename();
+            if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) {
+                return rb.fail().setMsg("上传文件不正确");
+            }
+            boolean isExcel2003 = true;
+            if (fileName.matches("^.+\\.(?i)(xlsx)$")) {
+                isExcel2003 = false;
+            }
+            InputStream is = file.getInputStream();
+            Workbook wb = null;
+            if (isExcel2003) {
+                wb = new HSSFWorkbook(is);
+            } else {
+                wb = new XSSFWorkbook(is);
+            }
+            Sheet sheet = wb.getSheetAt(0);
+            List<ImportBondAmountsVo> list = getBondAmountsSheetVal(sheet);
+            StringBuffer sbMsg = new StringBuffer();
+            Set<String> setMsg = new HashSet<>();
+           List<ImportBondAmountsUpdate> updates = new ArrayList<>();
+            if (!list.isEmpty() && list.size() > 0) {
+                for (ImportBondAmountsVo vo : list) {
+                    String vinNo = vo.getVinNo();
+                    String bondAmounts = vo.getBondAmounts();
+                    String sid = baseMapper.selSidByVinNo(vinNo);
+                    if (StringUtils.isBlank(sid)) {
+                        setMsg.add(vinNo);
+                    } else {
+                        ImportBondAmountsUpdate update = new ImportBondAmountsUpdate();
+                        update.setSid(sid);
+                        update.setBondAmounts(bondAmounts);
+                        updates.add(update);
+                    }
+                }
+            }
+            if (null != setMsg && setMsg.size() > 0) {
+                for (String s : setMsg) {
+                    sbMsg.append(s).append("、");
+                }
+                sbMsg.delete(sbMsg.length() - 1, sbMsg.length());
+                if (StringUtils.isNotBlank(sbMsg.toString())) {
+                    return rb.setMsg("车架号" + sbMsg.toString() + "不存在，导入失败");
+                }
+            }
+            if (!updates.isEmpty()) {
+                baseMapper.updateBoundsBySid(updates);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return rb.success().setMsg("导入成功");
+    }
+
+    private List<ImportBondAmountsVo> getBondAmountsSheetVal(Sheet sheet) {
+        List<ImportBondAmountsVo> list = new ArrayList<>();
+        Row row1 = sheet.getRow(0);
+        Map<Integer, String> header = new HashMap<>();
+        Map<String, String> map = new HashMap<>();
+        for (int i = 0; i < 3; i++) {
+            String trim = new String();
+            try {
+                trim = getCellVal(row1.getCell(i)).toString().trim();
+                String temp = getCellVal(row1.getCell(i)).toString().trim();
+                if (StringUtils.isNotBlank(temp)) {
+                    header.put(i, temp);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        for (int r = 2; r <= sheet.getLastRowNum(); r++) {
+            ImportBondAmountsVo info = new ImportBondAmountsVo();
+            Row row = sheet.getRow(r);
+            if (row == null) {
+                continue;
+            }
+            for (int i = 0; i < header.size(); i++) {
+                try {
+                    String temp = "";
+                    if (null != getCellVal(row.getCell(i))) {
+                        temp = getCellVal(row.getCell(i)).toString().trim();
+                    }
+                    String head = header.get(i);
+                    String field = "";
+                    if (StringUtils.isNotBlank(temp)) {
+                        field = temp;
+                    }
+                    if (head.equals("八位车架号")) {
+                        info.setVinNo(field);
+                    }
+                    if (head.equals("保证金")) {
+                        info.setBondAmounts(field);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    continue;
+                }
+            }
+            list.add(info);
+        }
+        return list;
+    }
+
     public ResultBean importHistoryData(MultipartFile file, String userSid, HttpServletRequest request) {
         ResultBean rb = ResultBean.fireFail();
         try {
@@ -5778,12 +5894,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                             String customerSid = "";
                             String customerName = "";
                             if (null != order) {
-                                    if (StringUtils.isNotBlank(order.getCustomerSid())) {
-                                        customerSid = order.getCustomerSid();
-                                    }
-                                    if (StringUtils.isNotBlank(order.getCustomerName())) {
-                                        customerName = order.getCustomerName();
-                                    }
+                                if (StringUtils.isNotBlank(order.getCustomerSid())) {
+                                    customerSid = order.getCustomerSid();
+                                }
+                                if (StringUtils.isNotBlank(order.getCustomerName())) {
+                                    customerName = order.getCustomerName();
+                                }
                             }
                             String orgSidPath = otherSchedule.getOrgSidPath();
                             SysOrganizationVo deptData = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
@@ -6074,7 +6190,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                 fundDay.setIsEnable(3);
                                 loanFundDays.add(fundDay);
                                 //生成资金占用费计提记录
-                                LoanPushFundHistory pushFundHistory  = new LoanPushFundHistory();
+                                LoanPushFundHistory pushFundHistory = new LoanPushFundHistory();
                                 pushFundHistory.setCreateBySid(userSid);
                                 pushFundHistory.setFund(B);
                                 pushFundHistory.setBusVinSid(plan.getBusVinSid());
@@ -6209,7 +6325,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                     fundDay.setBusSid(p.getSid());
                                     loanFundDays.add(fundDay);
                                     //生成资金占用费计提记录
-                                    LoanPushFundHistory pushFundHistory  = new LoanPushFundHistory();
+                                    LoanPushFundHistory pushFundHistory = new LoanPushFundHistory();
                                     pushFundHistory.setCreateBySid(userSid);
                                     pushFundHistory.setFund(B1);
                                     pushFundHistory.setBusVinSid(p.getBusVinSid());
@@ -6337,7 +6453,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                     fundDay.setBusSid(p.getSid());
                                     loanFundDays.add(fundDay);
                                     //生成资金占用费计提记录
-                                    LoanPushFundHistory pushFundHistory  = new LoanPushFundHistory();
+                                    LoanPushFundHistory pushFundHistory = new LoanPushFundHistory();
                                     pushFundHistory.setCreateBySid(userSid);
                                     pushFundHistory.setFund(B1);
                                     pushFundHistory.setBusVinSid(p.getBusVinSid());
@@ -6434,7 +6550,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                 fundDay.setBusSid(plan.getSid());
                                 loanFundDays.add(fundDay);
                                 //生成资金占用费计提记录
-                                LoanPushFundHistory pushFundHistory  = new LoanPushFundHistory();
+                                LoanPushFundHistory pushFundHistory = new LoanPushFundHistory();
                                 pushFundHistory.setCreateBySid(userSid);
                                 pushFundHistory.setFund(B);
                                 pushFundHistory.setBusVinSid(plan.getBusVinSid());
@@ -6587,7 +6703,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                     fundDay.setBusSid(p.getSid());
                                     loanFundDays.add(fundDay);
                                     //生成资金占用费计提记录
-                                    LoanPushFundHistory pushFundHistory  = new LoanPushFundHistory();
+                                    LoanPushFundHistory pushFundHistory = new LoanPushFundHistory();
                                     pushFundHistory.setCreateBySid(userSid);
                                     pushFundHistory.setFund(B1);
                                     pushFundHistory.setBusVinSid(p.getBusVinSid());
@@ -6715,7 +6831,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                     fundDay.setBusSid(p.getSid());
                                     loanFundDays.add(fundDay);
                                     //生成资金占用费计提记录
-                                    LoanPushFundHistory pushFundHistory  = new LoanPushFundHistory();
+                                    LoanPushFundHistory pushFundHistory = new LoanPushFundHistory();
                                     pushFundHistory.setCreateBySid(userSid);
                                     pushFundHistory.setFund(B1);
                                     pushFundHistory.setBusVinSid(p.getBusVinSid());
@@ -6819,7 +6935,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         LocalDate endDate = LocalDate.of(y1, m1, d1);
         Period period = Period.between(startDate, endDate);
         int totalMonths = period.getDays() == 0 ?
-                period.getYears() * 12 + period.getMonths() - 1: period.getYears() * 12 + period.getMonths();
+                period.getYears() * 12 + period.getMonths() - 1 : period.getYears() * 12 + period.getMonths();
         return totalMonths + 1;
     }
 
@@ -7278,4 +7394,6 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         }
         return rb.success().setData(bankOrOtherBank);
     }
+
+
 }

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

@@ -89,6 +89,7 @@ import com.yxt.anrui.riskcenter.biz.loansettlecompanyreduction.LoanSettleCompany
 import com.yxt.anrui.riskcenter.biz.loansettlecompanyreduction.LoanSettleCompanyReductionService;
 import com.yxt.anrui.riskcenter.biz.loansettlevehicle.LoanSettleVehicleService;
 import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsMapper;
+import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsService;
 import com.yxt.anrui.riskcenter.biz.loansolutionsdetail.LoanSolutionsDetailService;
 import com.yxt.common.base.config.component.DocPdfComponent;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -196,7 +197,8 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
     private FinKingDeeFeign finKingDeeFeign;
     @Autowired
     private BasePurchaseSystemFeign basePurchaseSystemFeign;
-
+    @Autowired
+    private LoanSolutionsService loanSolutionsService;
     public PagerVo<LoanSettleApplyVo> listPageVo(PagerQuery<LoanSettleApplyQuery> pq) {
         LoanSettleApplyQuery query = pq.getParams();
         QueryWrapper<LoanSettleApply> qw = new QueryWrapper<>();
@@ -622,6 +624,14 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             BigDecimal bondAmounts = BigDecimal.ZERO;
             if (null != schedule.getBondAmounts()) {
                 bondAmounts = schedule.getBondAmounts();
+            } else {
+                ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsService.selectDetailss(schedule.getSalesOrderSid());
+                if (solutionsDetailsVoResultBean.getData() != null) {
+                    SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
+                    if (StringUtils.isNotBlank(solutionsDetailsVo.getBondAmounts())) {
+                        bondAmounts = new BigDecimal(solutionsDetailsVo.getBondAmounts());
+                    }
+                }
             }
             settleApplyCommonVo.setLoanDeposit(bondAmounts.toString());
             //贷款保证金扣罚金额