Merge remote-tracking branch 'origin/master'

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java

@@ -89,7 +89,7 @@ public interface DailyReportFeign {
     @ApiOperation("集团日期初始化")
     @GetMapping("getReport")
     @ResponseBody
-    ResultBean<ReportVo> getReport(@RequestParam("date") String date,@RequestParam("userSid") String userSid);
+    ResultBean<ReportVo> getReport(@RequestParam("date") String date,@RequestParam("userSid") String userSid,@RequestParam("orgPath")String orgPath,@RequestParam("type")String type);
 
     @ApiOperation("集团事业部合集日报表")
     @GetMapping("list2")
@@ -111,20 +111,20 @@ public interface DailyReportFeign {
     @ResponseBody
     ResultBean<DailyReportListVo> pageList2(@RequestBody PagerQuery<DailyReportAppPagerQuery> pagerQuery);
 
-    @ApiOperation("事业部日期初始化")
+   /* @ApiOperation("事业部日期初始化")
     @GetMapping("getReport2")
     @ResponseBody
     ResultBean<ReportVo> getReport2(@RequestParam("date") String date, @RequestParam("orgPath") String orgPath,@RequestParam("userSid")String userSid);
-
+*/
     @ApiOperation("分公司日报表分页列表")
     @PostMapping("pageList3")
     @ResponseBody
     ResultBean<DailyReportListVo> pageList3(@RequestBody PagerQuery<DailyReportAppPagerQuery> pagerQuery);
 
-    @ApiOperation("分公司日期初始化")
+  /*  @ApiOperation("分公司日期初始化")
     @GetMapping("getReport3")
     @ResponseBody
     ResultBean<ReportVo> getReport3(@RequestParam("date") String date, @RequestParam("orgPath") String orgPath,@RequestParam("userSid")String userSid);
-
+*/
 
 }

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/ReportVo.java

@@ -112,10 +112,14 @@ public class ReportVo implements Vo {
     private String loan_not_amount;
     @ApiModelProperty("前三个月销售台数之和")
     private String saleAllToThree;
-
+    @ApiModelProperty("事业部sid")
     private String busOrgSid;
-
+    @ApiModelProperty("事业部名称")
+    private String busOrgName;
+    @ApiModelProperty("分公司sid")
     private String useOrgSid;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
 
     private List<ReportSetVo> list;
 }

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetFeign.java

@@ -1,6 +1,5 @@
 package com.yxt.anrui.reportcenter.api.reportset;
 
-import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportFeignFallback;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml

@@ -297,7 +297,7 @@
         ifnull(sum(loan_not_count), 0)              as loan_not_count,
         ifnull(sum(loan_not_amount), 0)             as loan_not_amount,
         ifnull(sum(saleAllToThree), 0)              as saleAllToThree,
-        busOrgSid,useOrgSid
+        busOrgSid,useOrgSid,busOrgName,useOrgName
         from daily_report
         <where>
             ${ew.sqlSegment}

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportRest.java

@@ -85,8 +85,8 @@ public class DailyReportRest implements DailyReportFeign {
     }
 
     @Override
-    public ResultBean<ReportVo> getReport(String date,String userSid) {
-        return dailyReportService.getReport(date,userSid);
+    public ResultBean<ReportVo> getReport(String date,String userSid,String orgPath,String type) {
+        return dailyReportService.getReport(date,userSid,orgPath,type);
     }
 
     @Override
@@ -111,10 +111,10 @@ public class DailyReportRest implements DailyReportFeign {
         return rb.success().setData(pv);
     }
 
-    @Override
+   /* @Override
     public ResultBean<ReportVo> getReport2(String date, String orgPath,String userSid) {
         return dailyReportService.getReport2(date,orgPath,userSid);
-    }
+    }*/
 
     @Override
     public ResultBean<DailyReportListVo> pageList3(PagerQuery<DailyReportAppPagerQuery> pagerQuery) {
@@ -123,8 +123,8 @@ public class DailyReportRest implements DailyReportFeign {
         return rb.success().setData(pv);
     }
 
-    @Override
+   /* @Override
     public ResultBean<ReportVo> getReport3(String date, String orgPath,String userSid) {
         return dailyReportService.getReport3(date,orgPath,userSid);
-    }
+    }*/
 }

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java

@@ -631,12 +631,26 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
         return p;
     }
 
-    public ResultBean<ReportVo> getReport(String date, String userSid) {
+    public ResultBean<ReportVo> getReport(String date, String userSid,String orgPath,String type) {
         ResultBean<ReportVo> rb = ResultBean.fireFail();
         QueryWrapper<DailyReport> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(date)) {
             qw.like("createTime", date);
         }
+        if(StringUtils.isNotBlank(type)){//事业部或分公司
+            if("syb".equals(type)){
+                if (StringUtils.isNotBlank(orgPath)) {
+                    List<String> stringList = Arrays.asList(orgPath.split("/"));
+                    String busOrgSid = orgPath.substring(37, 73);
+                    qw.eq("busOrgSid", busOrgSid);
+                }
+            }else if("fgs".equals(type)){
+                if (StringUtils.isNotBlank(orgPath)) {
+                    String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+                    qw.eq("useOrgSid", useOrgSid);
+                }
+            }
+        }
         ReportVo reportVo = baseMapper.getReport(qw);
         String ratio = "";
         if (StringUtils.isBlank(reportVo.getSaleAllToThree())) {

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankAppDetailsVo.java

@@ -0,0 +1,39 @@
+package com.yxt.anrui.riskcenter.api.loanoverduebank;
+
+import com.yxt.anrui.riskcenter.api.loanoverduebankdetails.LoanOverdueBankDetailsDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/16
+ **/
+@Data
+public class LoanOverdueBankAppDetailsVo {
+
+    //发起部门
+    @ApiModelProperty("申请部门")
+    private String createDept;
+    //发起人
+    @ApiModelProperty("申请人")
+    private String createByName;
+    //发起日期
+    @ApiModelProperty("发起日期")
+    private String createDate;
+    //截止时间
+    @ApiModelProperty("截止时间")
+    private String stopDate;
+    //备注
+    @ApiModelProperty("备注")
+    private String remarks;
+    //附件
+    private List<String> filesList = new ArrayList<>();
+    private String files;
+    //逾期客户列表
+    private List<LoanOverdueBankDetailsAppVo> detailsVoList = new ArrayList<>();
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankDetailsAppVo.java

@@ -0,0 +1,33 @@
+package com.yxt.anrui.riskcenter.api.loanoverduebank;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/16
+ **/
+@Data
+public class LoanOverdueBankDetailsAppVo {
+    @ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("贷款合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("资方合同编号")
+    private String bankContractNo;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("期数")
+    private String period;
+    @ApiModelProperty("平台逾期月还")
+    private String overdueMoney;
+    @ApiModelProperty("资方逾期月还")
+    private String bankOverdueMoney;
+    @ApiModelProperty("差异金额")
+    private String diffMoney;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankFeign.java

@@ -85,4 +85,8 @@ public interface LoanOverdueBankFeign {
     @PostMapping(value = "/delegate")
     @ResponseBody
     public ResultBean delegate(@RequestBody OverBankApplyDelegateQuery query);
+
+    @ApiOperation(value = "详情")
+    @GetMapping(value = "/getAppDetails")
+    ResultBean<LoanOverdueBankAppDetailsVo> getAppDetails(@RequestParam("sid") String sid);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefin/LoanOverdueFinAppVo.java

@@ -0,0 +1,37 @@
+package com.yxt.anrui.riskcenter.api.loanoverduefin;
+
+import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinAppDetailsVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/16
+ **/
+@Data
+public class LoanOverdueFinAppVo {
+
+    //发起部门
+    @ApiModelProperty("发起部门")
+    private String createDept;
+    //发起人
+    @ApiModelProperty("发起人")
+    private String createByName;
+    @ApiModelProperty("发起日期")
+    private String createDate;
+    @ApiModelProperty("截止时间")
+    private String stopDate;
+    @ApiModelProperty("备注")
+    private String remarks;
+    //附件
+    private List<String> filesList = new ArrayList<>();
+    private String files;
+    //逾期客户列表
+    @ApiModelProperty("逾期客户列表")
+    private List<LoanOverdueFinAppDetailsVo> detailsVoList = new ArrayList<>();
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefin/LoanOverdueFinFeign.java

@@ -45,7 +45,7 @@ public interface LoanOverdueFinFeign {
 
     @ApiOperation(value = "导入")
     @PostMapping("/getExcelInfo")
-    ResultBean<List<ExcelFinVo>> getExcelInfo(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request,@RequestParam(value = "useOrgSid")String useOrgSid) throws IOException;
+    ResultBean<List<ExcelFinVo>> getExcelInfo(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request, @RequestParam(value = "useOrgSid") String useOrgSid) throws IOException;
 
     @ApiOperation("删除/批量删除")
     @DeleteMapping("/delBySids")
@@ -81,8 +81,12 @@ public interface LoanOverdueFinFeign {
 
     @ApiOperation(value = "加签")
     @PostMapping(value = "/delegate")
-    @ResponseBody
     public ResultBean delegate(@RequestBody OverFinApplyDelegateQuery query);
 
+    @ApiOperation(value = "移动端审批详情")
+    @PostMapping(value = "/getAppDetails")
+    @ResponseBody
+    ResultBean<LoanOverdueFinAppVo> getAppDetails(@RequestParam("sid") String sid);
+
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefindetails/LoanOverdueFinAppDetailsVo.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.riskcenter.api.loanoverduefindetails;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/16
+ **/
+@Data
+public class LoanOverdueFinAppDetailsVo {
+
+    @ApiModelProperty("明细sid")
+    private String sid;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("贷款人sid")
+    private String loanSid;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("当前逾期金额")
+    private String overdueMoney;
+    @ApiModelProperty("累欠")
+    private String tiredDeficiency;
+    @ApiModelProperty("差异金额")
+    private String diffMoney;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("销售订单关联的车辆sid")
+    private String busVinSid;
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.riskcenter.api.loanoverduebank.LoanOverdueBank;
+import com.yxt.anrui.riskcenter.api.loanoverduebank.LoanOverdueBankAppDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanoverduebank.LoanOverdueBankDetailVo;
 import com.yxt.anrui.riskcenter.api.loanoverduebank.LoanOverdueBankVo;
 import com.yxt.anrui.riskcenter.api.loanoverduebankdetails.LoanOverdueBankDetailsDto;
@@ -30,4 +31,6 @@ public interface LoanOverdueBankMapper extends BaseMapper<LoanOverdueBank> {
     int updateFlowFiled(Map<String, Object> beanToMap);
 
     List<LoanOverdueBankDetailsDto> detailsList(@Param("useOrgSid") String useOrgSid, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("stopDate") String stopDate);
+
+    LoanOverdueBankAppDetailsVo getAppDetails(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.xml

@@ -103,4 +103,15 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="getAppDetails" resultType="com.yxt.anrui.riskcenter.api.loanoverduebank.LoanOverdueBankAppDetailsVo">
+        select lb.createDept,
+        lb.createByName,
+        DATE_FORMAT(lb.createTime, '%Y-%m-%d') as createDate,
+        lb.stopDate,
+        lb.remarks,
+        lb.files
+        from loan_overdue_bank lb
+        where lb.sid = #{sid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankRest.java

@@ -10,6 +10,7 @@ import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -30,6 +31,7 @@ import java.util.List;
  **/
 @RestController
 @RequestMapping("v1/LoanOverdueBank")
+@Api(tags = "逾期对账申请资方")
 public class LoanOverdueBankRest implements LoanOverdueBankFeign {
 
     @Autowired
@@ -121,4 +123,9 @@ public class LoanOverdueBankRest implements LoanOverdueBankFeign {
     public ResultBean delegate(OverBankApplyDelegateQuery query) {
         return loanOverdueBankService.delegate(query);
     }
+
+    @Override
+    public ResultBean<LoanOverdueBankAppDetailsVo> getAppDetails(String sid) {
+        return loanOverdueBankService.getAppDetails(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankService.java

@@ -816,4 +816,24 @@ public class LoanOverdueBankService extends MybatisBaseService<LoanOverdueBankMa
         flowFeign.delegate(delegateQuery);
         return rb.success();
     }
+
+    public ResultBean<LoanOverdueBankAppDetailsVo> getAppDetails(String sid) {
+        ResultBean<LoanOverdueBankAppDetailsVo> rb = ResultBean.fireFail();
+        LoanOverdueBank loanOverdueBank = fetchBySid(sid);
+        if (loanOverdueBank == null) {
+            return rb.setMsg("该申请不存在");
+        }
+        LoanOverdueBankAppDetailsVo loanOverdueBankAppDetailsVo = baseMapper.getAppDetails(sid);
+        String files = loanOverdueBankAppDetailsVo.getFiles();
+        if (StringUtils.isNotBlank(files)) {
+            List<String> fileList = Arrays.asList(files.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
+            loanOverdueBankAppDetailsVo.setFilesList(fileList);
+        }
+        List<LoanOverdueBankDetailsAppVo> detailsVoList = loanOverdueBankDetailsService.getAppDetails(sid);
+        detailsVoList.removeAll(Collections.singleton(null));
+        if (!detailsVoList.isEmpty()) {
+            loanOverdueBankAppDetailsVo.setDetailsVoList(detailsVoList);
+        }
+        return rb.success().setData(loanOverdueBankAppDetailsVo);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebankdetails/LoanOverdueBankDetailsMapper.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.riskcenter.biz.loanoverduebankdetails;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.riskcenter.api.loanoverduebank.LoanOverdueBankDetailsAppVo;
 import com.yxt.anrui.riskcenter.api.loanoverduebankdetails.LoanOverdueBankDetails;
 import com.yxt.anrui.riskcenter.api.loanoverduebankdetails.LoanOverdueBankDetailsDto;
 import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleDetailsVo;
@@ -21,4 +22,6 @@ public interface LoanOverdueBankDetailsMapper extends BaseMapper<LoanOverdueBank
     List<LoanOverdueBankDetailsDto> selectByMainSid(String sid);
 
     List<LoanRepaymentScheduleDetailsVo> selectBankContractNo(@Param("bankContractNo") String bankContractNo, @Param("useOrgSid") String useOrgSid);
+
+    List<LoanOverdueBankDetailsAppVo> getAppDetails(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebankdetails/LoanOverdueBankDetailsMapper.xml

@@ -29,7 +29,28 @@
 
     <select id="selectBankContractNo"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleDetailsVo">
-        select ld.* from anrui_riskcenter.loan_repayment_plan_details ld
-        where ld.bankContractNo = #{bankContractNo} and ld.useOrgSid = #{useOrgSid}
+        select ld.*
+        from anrui_riskcenter.loan_repayment_plan_details ld
+        where ld.bankContractNo = #{bankContractNo}
+          and ld.useOrgSid = #{useOrgSid}
+    </select>
+
+    <select id="getAppDetails" resultType="com.yxt.anrui.riskcenter.api.loanoverduebank.LoanOverdueBankDetailsAppVo">
+        select sid,
+               customerName,
+               customerSid,
+               loanName,
+               loanSid,
+               overdueMoney,
+               loanContractNo,
+               bankContractNo,
+               bankSid,
+               bankName,
+               period,
+               bankOverdueMoney,
+               bankOverdueInterest,
+               diffMoney
+        from loan_overdue_bank_details
+        where mainSid = #{sid}
     </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebankdetails/LoanOverdueBankDetailsService.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.riskcenter.biz.loanoverduebankdetails;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.riskcenter.api.loanoverduebank.LoanOverdueBank;
+import com.yxt.anrui.riskcenter.api.loanoverduebank.LoanOverdueBankDetailsAppVo;
 import com.yxt.anrui.riskcenter.api.loanoverduebankdetails.LoanOverdueBankDetails;
 import com.yxt.anrui.riskcenter.api.loanoverduebankdetails.LoanOverdueBankDetailsDto;
 import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinDetails;
@@ -40,4 +41,8 @@ public class LoanOverdueBankDetailsService extends MybatisBaseService<LoanOverdu
     public List<LoanRepaymentScheduleDetailsVo> selectBankContractNo(String bankContractNo, String useOrgSid) {
         return baseMapper.selectBankContractNo(bankContractNo,useOrgSid);
     }
+
+    public List<LoanOverdueBankDetailsAppVo> getAppDetails(String sid) {
+        return baseMapper.getAppDetails(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.LoanOverdueFin;
+import com.yxt.anrui.riskcenter.api.loanoverduefin.LoanOverdueFinAppVo;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.LoanOverdueFinDetailVo;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.LoanOverdueFinVo;
 import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinDetailsDto;
@@ -30,4 +31,6 @@ public interface LoanOverdueFinMapper extends BaseMapper<LoanOverdueFin> {
     int updateFlowFiled(Map<String, Object> beanToMap);
 
     List<LoanOverdueFinDetailsDto> detailsList(@Param("useOrgSid") String useOrgSid, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("stopDate") String stopDate);
+
+    LoanOverdueFinAppVo getAppDetails(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.xml

@@ -93,4 +93,15 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="getAppDetails" resultType="com.yxt.anrui.riskcenter.api.loanoverduefin.LoanOverdueFinAppVo">
+        select lf.createDept,
+        lf.createByName,
+        date_format(lf.createTime, '%Y-%m-%d') as createDate,
+        lf.stopDate,
+        lf.remarks,
+        lf.files
+        from loan_overdue_fin lf
+        where lf.sid = #{sid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinRest.java

@@ -10,6 +10,7 @@ import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -30,6 +31,7 @@ import java.util.List;
  **/
 @RestController
 @RequestMapping("v1/LoanOverdueFin")
+@Api(tags = "逾期对账申请财务")
 public class LoanOverdueFinRest implements LoanOverdueFinFeign {
 
     @Autowired
@@ -121,4 +123,9 @@ public class LoanOverdueFinRest implements LoanOverdueFinFeign {
     public ResultBean delegate(OverFinApplyDelegateQuery query) {
         return loanOverdueFinService.delegate(query);
     }
+
+    @Override
+    public ResultBean<LoanOverdueFinAppVo> getAppDetails(String sid) {
+        return loanOverdueFinService.getAppDetails(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java

@@ -30,6 +30,7 @@ import com.yxt.anrui.riskcenter.api.loanoverduefin.flowable.OverFinApplyDelegate
 import com.yxt.anrui.riskcenter.api.loanoverduefin.flowable.OverdueApplyNodeQuery;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.flowable.OverdueApplyNodeVo;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.flowable.OverdueApplyTaskQuery;
+import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinAppDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinDetailsDto;
 import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleDetailsVo;
 import com.yxt.anrui.riskcenter.biz.loanoverduefindetails.LoanOverdueFinDetailsService;
@@ -837,4 +838,24 @@ public class LoanOverdueFinService extends MybatisBaseService<LoanOverdueFinMapp
         flowFeign.delegate(delegateQuery);
         return rb.success();
     }
+
+    public ResultBean<LoanOverdueFinAppVo> getAppDetails(String sid) {
+        ResultBean<LoanOverdueFinAppVo> rb = ResultBean.fireFail();
+        LoanOverdueFin loanOverdueFin = fetchBySid(sid);
+        if (loanOverdueFin == null) {
+            return rb.setMsg("该申请不存在");
+        }
+        LoanOverdueFinAppVo loanOverdueFinAppVo = baseMapper.getAppDetails(sid);
+        String files = loanOverdueFinAppVo.getFiles();
+        if (StringUtils.isNotBlank(files)) {
+            List<String> fileList = Arrays.asList(files.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
+            loanOverdueFinAppVo.setFilesList(fileList);
+        }
+        List<LoanOverdueFinAppDetailsVo> detailsVoList = loanOverdueFinDetailsService.getAppDetails(sid);
+        detailsVoList.removeAll(Collections.singleton(null));
+        if (!detailsVoList.isEmpty()) {
+            loanOverdueFinAppVo.setDetailsVoList(detailsVoList);
+        }
+        return rb.success().setData(loanOverdueFinAppVo);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefindetails/LoanOverdueFinDetailsMapper.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.riskcenter.biz.loanoverduefindetails;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinAppDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinDetails;
 import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinDetailsDto;
 import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleDetailsVo;
@@ -21,4 +22,6 @@ public interface LoanOverdueFinDetailsMapper extends BaseMapper<LoanOverdueFinDe
     List<LoanOverdueFinDetailsDto> selectByMainSid(String sid);
 
     List<LoanRepaymentScheduleDetailsVo> selectByCustomerNo(@Param("customerNo") String customerNo, @Param("useOrgSid") String useOrgSid);
+
+    List<LoanOverdueFinAppDetailsVo> getAppDetails(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefindetails/LoanOverdueFinDetailsMapper.xml

@@ -25,9 +25,27 @@
 
     <select id="selectByCustomerNo"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleDetailsVo">
-        select ld.* from anrui_riskcenter.loan_repayment_plan_details ld
-        left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = ld.busVinSid
-        left join anrui_buscenter.bus_sales_order bo on bo.sid = bv.salesOrderSid
-        where bv.temporaryNo = #{customerNo} and ld.useOrgSid = #{useOrgSid}
+        select ld.*
+        from anrui_riskcenter.loan_repayment_plan_details ld
+                 left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = ld.busVinSid
+                 left join anrui_buscenter.bus_sales_order bo on bo.sid = bv.salesOrderSid
+        where bv.temporaryNo = #{customerNo}
+          and ld.useOrgSid = #{useOrgSid}
+    </select>
+
+    <select id="getAppDetails"
+            resultType="com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinAppDetailsVo">
+        select sid,
+               customerName,
+               customerSid,
+               loanName,
+               loanSid,
+               overdueMoney,
+               diffMoney,
+               tiredDeficiency,
+               vinNo,
+               busVinSid
+        from loan_overdue_fin_details
+        where mainSid = #{sid}
     </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefindetails/LoanOverdueFinDetailsService.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.riskcenter.biz.loanoverduefindetails;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinAppDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinDetails;
 import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinDetailsDto;
 import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleDetailsVo;
@@ -45,4 +46,8 @@ public class LoanOverdueFinDetailsService extends MybatisBaseService<LoanOverdue
     public List<LoanRepaymentScheduleDetailsVo> selectByCustomerNo(String customerNo,String useOrgSid) {
         return baseMapper.selectByCustomerNo(customerNo,useOrgSid);
     }
+
+    public List<LoanOverdueFinAppDetailsVo> getAppDetails(String sid) {
+        return baseMapper.getAppDetails(sid);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionVehDetailsVo.java

@@ -87,6 +87,8 @@ public class AppBeCollectionVehDetailsVo implements Vo {
     private String lockCarMoney;
     @ApiModelProperty("远程控制状态")
     private String lockCarState;
+    @ApiModelProperty("提示信息")
+    private String notice;
     @ApiModelProperty("还款协议附件")
     private List<String> appHkxy = new ArrayList<>();
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduebank/OverdueBankDetailsAppVo.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.terminal.api.risk.overduebank;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/16
+ **/
+@Data
+public class OverdueBankDetailsAppVo {
+
+    @ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("贷款合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("资方合同编号")
+    private String bankContractNo;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("期数")
+    private String period;
+    @ApiModelProperty("平台逾期月还")
+    private String overdueMoney;
+    @ApiModelProperty("资方逾期月还")
+    private String bankOverdueMoney;
+    @ApiModelProperty("差异金额")
+    private String diffMoney;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduebank/OverdueBankFeign.java

@@ -7,10 +7,7 @@ import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @description:
@@ -48,4 +45,9 @@ public interface OverdueBankFeign {
     @GetMapping("/getFlowOperateTitle")
     @ResponseBody
     ResultBean<String> getFlowOperateTitle(@SpringQueryMap OverdueBankQuery query);
+
+    @ApiOperation("详情")
+    @GetMapping("/getOverdueBankApply/{sid}")
+    @ResponseBody
+    ResultBean<OverdueBankVo> getOverdueBankApply(@PathVariable("sid") String sid);
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduebank/OverdueBankVo.java

@@ -0,0 +1,36 @@
+package com.yxt.anrui.terminal.api.risk.overduebank;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/16
+ **/
+@Data
+public class OverdueBankVo {
+
+    //发起部门
+    @ApiModelProperty("申请部门")
+    private String createDept;
+    //发起人
+    @ApiModelProperty("申请人")
+    private String createByName;
+    //发起日期
+    @ApiModelProperty("发起日期")
+    private String createDate;
+    //截止时间
+    @ApiModelProperty("截止时间")
+    private String stopDate;
+    //备注
+    @ApiModelProperty("备注")
+    private String remarks;
+    //附件
+    private List<String> filesList = new ArrayList<>();
+    //逾期客户列表
+    private List<OverdueBankDetailsAppVo> detailsVoList = new ArrayList<>();
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduefin/OverDueFnAppVo.java

@@ -0,0 +1,36 @@
+package com.yxt.anrui.terminal.api.risk.overduefin;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/16
+ **/
+@Data
+public class OverDueFnAppVo {
+
+    //发起部门
+    @ApiModelProperty("发起部门")
+    private String createDept;
+    //发起人
+    @ApiModelProperty("发起人")
+    private String createByName;
+    @ApiModelProperty("发起日期")
+    private String createDate;
+    @ApiModelProperty("截止时间")
+    private String stopDate;
+    @ApiModelProperty("备注")
+    private String remarks;
+    //附件
+    private List<String> filesList = new ArrayList<>();
+    //逾期客户列表
+    @ApiModelProperty("逾期客户列表")
+    private List<OverdueFinAppDetailsVo> detailsVoList = new ArrayList<>();
+
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduefin/OverdueFinAppDetailsVo.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.terminal.api.risk.overduefin;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/16
+ **/
+@Data
+public class OverdueFinAppDetailsVo {
+
+    @ApiModelProperty("明细sid")
+    private String sid;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("贷款人sid")
+    private String loanSid;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("当前逾期金额")
+    private String overdueMoney;
+    @ApiModelProperty("累欠")
+    private String tiredDeficiency;
+    @ApiModelProperty("差异金额")
+    private String diffMoney;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("销售订单关联的车辆sid")
+    private String busVinSid;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduefin/OverdueFinFeign.java

@@ -7,10 +7,7 @@ import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @description:
@@ -48,4 +45,9 @@ public interface OverdueFinFeign {
     @GetMapping("/getFlowOperateTitle")
     @ResponseBody
     ResultBean<String> getFlowOperateTitle(@SpringQueryMap OverdueFinQuery query);
+
+    @ApiOperation("详情")
+    @GetMapping("/getOverdueFinApply/{sid}")
+    @ResponseBody
+    ResultBean<OverDueFnAppVo> getOverdueFinApply(@PathVariable("sid") String sid);
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java

@@ -75,6 +75,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -273,6 +274,13 @@ public class BeCollectionService {
     public ResultBean<AppBeCollectionApplyDetailsVo> collectionDetail(String sid) {
         ResultBean rb = ResultBean.fireFail();
         LoanBeCollectionApplyDetailsVo loanBeCollectionApplyDetailsVo = loanBeCollectionApplyFeign.fetchDetailsBySid(sid).getData();
+        String lockCarRemarks = loanBeCollectionApplyDetailsVo.getLockCarRemarks();
+        List<String> vinNo = new ArrayList<>();
+        if (StringUtils.isNotBlank(lockCarRemarks)){
+            lockCarRemarks = lockCarRemarks.substring(lockCarRemarks.indexOf('号') + 1, lockCarRemarks.indexOf('已'));
+            String[] vinNos = lockCarRemarks.split(",");
+            vinNo = Arrays.asList(vinNos);
+        }
         AppBeCollectionApplyDetailsVo appBeCollectionApplyDetailsVo = new AppBeCollectionApplyDetailsVo();
         appBeCollectionApplyDetailsVo.setPublishInfo(loanBeCollectionApplyDetailsVo.getDeptName() + "-" + loanBeCollectionApplyDetailsVo.getCreateByName());
         appBeCollectionApplyDetailsVo.setTime(loanBeCollectionApplyDetailsVo.getCreateTime());
@@ -314,6 +322,15 @@ public class BeCollectionService {
             appBeCollectionVehDetailsVo.setInstalments(loanBeCollectionVehDetail.getBeOverduePeriod());
             appBeCollectionVehDetailsVo.setBeOverdueMoney(loanBeCollectionVehDetail.getBeOverdueMoney());
             appBeCollectionVehDetailsVo.setBeOverdueMoneyAndPeriod(loanBeCollectionVehDetail.getBeOverdueMoneyAndPeriod());
+            if (vinNo != null && vinNo.size() > 0){
+                if (vinNo.contains(loanBeCollectionVehDetail.getVinNo())){
+                    appBeCollectionVehDetailsVo.setNotice("注：车架号" + loanBeCollectionVehDetail.getVinNo() + "已超过制度规定的远程控制次数，应要求客户全部结清车款。");
+                }else {
+                    appBeCollectionVehDetailsVo.setNotice("");
+                }
+            }
+            appBeCollectionVehDetailsVo.setLockCarState(loanBeCollectionVehDetail.getLockCarState());
+            appBeCollectionVehDetailsVo.setLockCarMoney(loanBeCollectionVehDetail.getLockCarMoney());
             List<LoanBeCollectionFileVo> hkxyFiles = loanBeCollectionVehDetail.getHkxyFiles();
             ArrayList<String> appHkxys = new ArrayList<>();
             if (hkxyFiles != null && hkxyFiles.size() > 0) {

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/overduebank/OverdueBankRest.java

@@ -1,10 +1,12 @@
 package com.yxt.anrui.terminal.biz.risk.overduebank;
 
 import com.yxt.anrui.terminal.api.risk.overduebank.OverdueBankFeign;
+import com.yxt.anrui.terminal.api.risk.overduebank.OverdueBankVo;
 import com.yxt.anrui.terminal.api.risk.overduebank.flowable.OverdueBankDto;
 import com.yxt.anrui.terminal.api.risk.overduebank.flowable.OverdueBankQuery;
 import com.yxt.anrui.terminal.api.risk.overduebank.flowable.OverdueBankTaskQuery;
 import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
  **/
 @Controller
 @RequestMapping("/risk/v1/overduebank")
+@Api(tags = "逾期对账申请资方")
 public class OverdueBankRest implements OverdueBankFeign {
 
     @Autowired
@@ -45,4 +48,9 @@ public class OverdueBankRest implements OverdueBankFeign {
     public ResultBean<String> getFlowOperateTitle(OverdueBankQuery query) {
         return overdueBankService.getFlowOperateTitle(query);
     }
+
+    @Override
+    public ResultBean<OverdueBankVo> getOverdueBankApply(String sid) {
+        return overdueBankService.getOverdueBankApply(sid);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/overduebank/OverdueBankService.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.terminal.biz.risk.overduebank;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.riskcenter.api.loanoverduebank.LoanOverdueBankAppDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanoverduebank.LoanOverdueBankFeign;
 import com.yxt.anrui.riskcenter.api.loanoverduebank.flowable.CompleteBankDto;
 import com.yxt.anrui.riskcenter.api.loanoverduebank.flowable.OverdueBankApplyNodeQuery;
@@ -10,6 +11,7 @@ import com.yxt.anrui.riskcenter.api.loantemplate.flowable.TemplateApplyNodeQuery
 import com.yxt.anrui.riskcenter.api.loantemplate.flowable.TemplateApplyNodeVo;
 import com.yxt.anrui.riskcenter.api.loantemplate.flowable.TemplateApplyTaskQuery;
 import com.yxt.anrui.riskcenter.api.loantemplate.flowable.TemplateCompleteDto;
+import com.yxt.anrui.terminal.api.risk.overduebank.OverdueBankVo;
 import com.yxt.anrui.terminal.api.risk.overduebank.flowable.OverdueBankDto;
 import com.yxt.anrui.terminal.api.risk.overduebank.flowable.OverdueBankQuery;
 import com.yxt.anrui.terminal.api.risk.overduebank.flowable.OverdueBankTaskQuery;
@@ -104,4 +106,16 @@ public class OverdueBankService {
         }
         return rb.success().setData(data);
     }
+
+    public ResultBean<OverdueBankVo> getOverdueBankApply(String sid) {
+        ResultBean<OverdueBankVo> rb = ResultBean.fireFail();
+        OverdueBankVo overdueBankVo = new OverdueBankVo();
+        ResultBean<LoanOverdueBankAppDetailsVo> resultBean = loanOverdueBankFeign.getAppDetails(sid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        LoanOverdueBankAppDetailsVo loanOverdueBankAppDetailsVo = resultBean.getData();
+        BeanUtil.copyProperties(loanOverdueBankAppDetailsVo, overdueBankVo);
+        return rb.success().setData(overdueBankVo);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/overduefin/OverdueFinRest.java

@@ -1,10 +1,12 @@
 package com.yxt.anrui.terminal.biz.risk.overduefin;
 
+import com.yxt.anrui.terminal.api.risk.overduefin.OverDueFnAppVo;
 import com.yxt.anrui.terminal.api.risk.overduefin.OverdueFinFeign;
 import com.yxt.anrui.terminal.api.risk.overduefin.flowable.OverdueFinDto;
 import com.yxt.anrui.terminal.api.risk.overduefin.flowable.OverdueFinQuery;
 import com.yxt.anrui.terminal.api.risk.overduefin.flowable.OverdueFinTaskQuery;
 import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
  **/
 @Controller
 @RequestMapping("/risk/v1/overduefin")
+@Api(tags = "逾期对账申请财务")
 public class OverdueFinRest implements OverdueFinFeign {
 
     @Autowired
@@ -45,4 +48,9 @@ public class OverdueFinRest implements OverdueFinFeign {
     public ResultBean<String> getFlowOperateTitle(OverdueFinQuery query) {
         return overdueFinService.getFlowOperateTitle(query);
     }
+
+    @Override
+    public ResultBean<OverDueFnAppVo> getOverdueFinApply(String sid) {
+        return overdueFinService.getOverdueFinApply(sid);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/overduefin/OverdueFinService.java

@@ -1,11 +1,13 @@
 package com.yxt.anrui.terminal.biz.risk.overduefin;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.riskcenter.api.loanoverduefin.LoanOverdueFinAppVo;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.LoanOverdueFinFeign;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.flowable.CompleteDto;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.flowable.OverdueApplyNodeQuery;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.flowable.OverdueApplyNodeVo;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.flowable.OverdueApplyTaskQuery;
+import com.yxt.anrui.terminal.api.risk.overduefin.OverDueFnAppVo;
 import com.yxt.anrui.terminal.api.risk.overduefin.flowable.OverdueFinDto;
 import com.yxt.anrui.terminal.api.risk.overduefin.flowable.OverdueFinQuery;
 import com.yxt.anrui.terminal.api.risk.overduefin.flowable.OverdueFinTaskQuery;
@@ -99,4 +101,16 @@ public class OverdueFinService {
         }
         return rb.success().setData(data);
     }
+
+    public ResultBean<OverDueFnAppVo> getOverdueFinApply(String sid) {
+        ResultBean<OverDueFnAppVo> rb = ResultBean.fireFail();
+        OverDueFnAppVo overDueFnAppVo = new OverDueFnAppVo();
+        ResultBean<LoanOverdueFinAppVo> resultBean = loanOverdueFinFeign.getAppDetails(sid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        LoanOverdueFinAppVo loanOverdueFinAppVo = resultBean.getData();
+        BeanUtil.copyProperties(loanOverdueFinAppVo, overDueFnAppVo);
+        return rb.success().setData(overDueFnAppVo);
+    }
 }