Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyQuery.java

@@ -27,5 +27,6 @@ public class LoanBuckleApplyQuery implements Query {
     private String billNo;
     private String applyStartDate;
     private String applyEndDate;
-
+    private String closingStartDate;
+    private String closingEndDate;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyVo.java

@@ -4,6 +4,8 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author Administrator
  * @description
@@ -31,6 +33,7 @@ public class LoanBuckleApplyVo implements Vo {
     private String procInstId; // 流程实例的sid
     @ApiModelProperty("备注")
     private String remarks; // 备注
-
+    @ApiModelProperty("办结日期")
+    private Date closingDate;
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryFeign.java

@@ -31,7 +31,7 @@ import java.util.List;
         fallback = LoanRepaymentHistoryFeignFallback.class)
 public interface LoanRepaymentHistoryFeign {
 
-    @ApiOperation("当月还款记录列表")
+    @ApiOperation("资方划扣还款明细列表")
     @PostMapping("/monthListPage")
     public ResultBean<PagerVo<LoanRepaymentHistoryVo>> monthListPage(@RequestBody PagerQuery<LoanRepaymentHistoryQuery> pq);
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/TransferPaymentQuery.java

@@ -22,6 +22,8 @@ public class TransferPaymentQuery implements Query {
     private String accountTypeKey; //转付账户类型key
     private String prepareStartDate; //预转付开始日期
     private String prepareEndDate; //预转付结束日期
+    private String loanContractNo; //消贷合同编号
+    private String overdue; // 是否逾期 0是 1否
     @ApiModelProperty("组织全路径")
     private String orgPath;
     @ApiModelProperty("菜单sid")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApply.java

@@ -51,5 +51,6 @@ public class LoanTransferPaymentApply extends BaseEntity {
     private String payFormKey;
     @ApiModelProperty("打款时需要备注内容")
     private String payRemarks;
-
+    @ApiModelProperty("办结日期")
+    private Date closingDate;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyQuery.java

@@ -27,5 +27,6 @@ public class LoanTransferPaymentApplyQuery implements Query {
     private String billNo;
     private String applyStartDate;
     private String applyEndDate;
-
+    private String closingStartDate;
+    private String closingEndDate;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyVo.java

@@ -4,6 +4,8 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author Administrator
  * @description
@@ -31,7 +33,8 @@ public class LoanTransferPaymentApplyVo implements Vo {
     private String procInstId; // 流程实例的sid
     @ApiModelProperty("备注")
     private String remarks; // 备注
-
+    @ApiModelProperty("办结日期")
+    private Date closingDate;
 
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceapply/LoanVehClearanceApplyDetailsVo.java

@@ -26,12 +26,18 @@
 package com.yxt.anrui.riskcenter.api.loanvehclearanceapply;
 
 
+import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo;
+import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDetailsVo;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Project: anrui-riskcenter(车辆远程解控申请) <br/>
  * File: LoanVehClearanceApplyVo.java <br/>
@@ -51,6 +57,8 @@ public class LoanVehClearanceApplyDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("申请日期")
+    private String createTime;
 	@ApiModelProperty("创建人")
     private String createByName; // 创建人
 	@ApiModelProperty("申请编号")
@@ -75,5 +83,8 @@ public class LoanVehClearanceApplyDetailsVo implements Vo {
     private String nodeState; // 流程状态
 	@ApiModelProperty("任务id")
     private String taskId; // 任务id
-
+    @ApiModelProperty("附件")
+    private List<LoanVehClearanceFileVo> files = new ArrayList<>();
+    @ApiModelProperty("逾期车辆列表")
+    private List<LoanVehClearanceVehDetailsVo> loanVehClearanceVehDetailsVoList;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehDetailsVo.java

@@ -26,12 +26,15 @@
 package com.yxt.anrui.riskcenter.api.loanvehclearanceveh;
 
 
+import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFile;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui-riskcenter(车辆远程解控申请) <br/>
  * File: LoanVehClearanceVehVo.java <br/>
@@ -82,4 +85,6 @@ public class LoanVehClearanceVehDetailsVo implements Vo {
 	@ApiModelProperty("远程控制申请sid")
     private String mainSid; // 远程控制申请sid
 
+    @ApiModelProperty
+    private List<LoanVehClearanceVehFile> sids;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehFile.java

@@ -0,0 +1,52 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanvehclearanceveh;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * Project: anrui-riskcenter(催收措施申请) <br/>
+ * File: LoanBeCollectionVehVo.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehVo <br/>
+ * Description: 逾期催收车辆 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-12-12 16:06:20 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "逾期催收车辆 视图数据详情", description = "逾期催收车辆 视图数据详情")
+public class LoanVehClearanceVehFile implements Vo {
+
+    private String name;
+    private String sid;
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyMapper.xml

@@ -28,7 +28,8 @@
         remarks,
         billNo,
         procDefId,
-        procInstId
+        procInstId,
+        date_format(closingDate, '%Y-%m-%d') as closingDate
         FROM loan_buckle_apply
         <where>
             ${ew.sqlSegment}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java

@@ -149,6 +149,11 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
         qw.apply(StringUtils.isNotEmpty(applyStartTime), "date_format (applyDate,'%Y-%m-%d') >= date_format('" + applyStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(applyEndTime), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndTime + "','%Y-%m-%d')"
                 );
+        String closingStartDate = pagerQuery.getClosingStartDate();
+        String closingEndDate = pagerQuery.getClosingEndDate();
+        qw.apply(StringUtils.isNotEmpty(closingStartDate), "date_format (closingDate,'%Y-%m-%d') >= date_format('" + closingStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(closingEndDate), "date_format (closingDate,'%Y-%m-%d') <= date_format('" + closingEndDate + "','%Y-%m-%d')"
+                );
         qw.eq("isDelete", 0);
         qw.orderByDesc("createTime");
         IPage<LoanBuckleApplyVo> pagging = baseMapper.listPage(page, qw);
@@ -175,8 +180,6 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
     }
 
 
-
-
     /**
      * 生成申请单单据编号
      *
@@ -200,6 +203,9 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
     public ResultBean<String> saveBuckle(LoanBuckleApplyDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = "";
+        if (dto.getRecords().isEmpty()) {
+            return rb.setMsg("当月还款记录列表不能为空");
+        }
         if (StringUtils.isNotBlank(dto.getSid())) {
             sid = dto.getSid();
             LoanBuckleApply updateEntity = fetchBySid(sid);
@@ -378,6 +384,8 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
         ResultBean<String> resultBean = saveBuckle(dto);
         if (resultBean.getSuccess()) {
             businessSid = resultBean.getData();
+        } else {
+            return rb.setMsg(resultBean.getMsg());
         }
         LoanBuckleApply entity = fetchBySid(businessSid);
         String orgSidPath = "";

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

@@ -42,7 +42,7 @@ public interface LoanRepaymentHistoryMapper extends BaseMapper<LoanRepaymentHist
 
     IPage<TransferPaymentVo> transferPaymentList(IPage<LoanRepaymentHistory> page, @Param(Constants.WRAPPER) QueryWrapper<LoanRepaymentHistory> qw);
 
-    IPage<RepaymentStatisticsVo> repaymentStatistics(IPage<LoanRepaymentHistory> page, @Param(Constants.WRAPPER) QueryWrapper<LoanRepaymentHistory> qw);
+    List<RepaymentStatisticsVo> repaymentStatistics(@Param(Constants.WRAPPER) QueryWrapper<LoanRepaymentHistory> qw);
 
     List<String> selnewUpdateTimeByPlanSid(@Param("sid") String sid);
 

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

@@ -100,6 +100,7 @@
         select *
         from loan_repayment_history
         where planDetailSid = #{planSid}
+          and returnWayKey != '02'
     </select>
     <select id="selUpdateStateList" resultType="java.lang.String">
         SELECT

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

@@ -137,6 +137,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
     private ReturnExcelInfo getSheetVal(Sheet sheet, int[] resultCell) {
         ReturnExcelInfo importReturn = new ReturnExcelInfo();
         List<RepaymentExcelInfo> importVoList = new ArrayList<>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         int[] resultIndex = new int[resultCell.length];
         Set<String> checkWord = new HashSet<>();
         Set<String> checkWord2 = new HashSet<>();
@@ -154,6 +155,18 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                         NullPointerException nullPointerException = new NullPointerException();
                     }
                     String temp = getCellVal(row.getCell(i)).toString().trim();
+                    Date dateCellValue = null;
+                    String check = new String();
+                    if (i == 2) {
+                        if (StringUtils.isNotBlank(temp)) {
+                            if (temp.contains("-")) {
+                                check = "0";
+                            } else {
+                                dateCellValue = row.getCell(2).getDateCellValue();
+                                check = "1";
+                            }
+                        }
+                    }
                     for (int j = 0; j < resultCell.length; j++) {
                         if (i == resultCell[j]) {
                             switch (i) {
@@ -164,7 +177,11 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                                     importVo.setPeriod(temp);
                                     break;
                                 case 2:
-                                    importVo.setRealReturnTime(temp);
+                                    if (check.equals("1")) {
+                                        importVo.setRealReturnTime(sdf.format(dateCellValue));
+                                    } else if (check.equals("0")) {
+                                        importVo.setRealReturnTime(temp);
+                                    }
                                     break;
                                 case 3:
                                     importVo.setRealMoney(temp);
@@ -204,7 +221,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
             importVoList.add(importVo);
         }
         StringBuffer sbBankCNo = new StringBuffer();
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
         if (!importVoList.isEmpty()) {
             for (RepaymentExcelInfo excelInfo : importVoList) {
                 if (StringUtils.isBlank(excelInfo.getRealReturnTime()) ||
@@ -474,6 +491,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
             qw.ne("h.buckleKey", "002");
             qw.ne("h.buckleKey", "003");
         }
+        qw.ne("h.returnWayKey","02");
         String dueStartDate = pagerQuery.getDueStartDate();
         String dueEndDate = pagerQuery.getDueEndDate();
         qw.apply(StringUtils.isNotEmpty(dueStartDate), "date_format (p.dueDate,'%Y-%m-%d') >= date_format('" + dueStartDate + "','%Y-%m-%d')").
@@ -713,6 +731,8 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                     baseMapper.updateById(repaymentHistory);
                 }
             }
+        } else {
+            return rb.setMsg("暂无可更新的还款记录");
         }
         return rb.success();
     }
@@ -839,10 +859,19 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
             }
         }
         qw.eq("h.returnWayKey", "02");
-        qw.apply("date_format (h.actualDate,'%Y-%m-%d') <= date_format(p.dueDate,'%Y-%m-%d')");
+        if (StringUtils.isNotBlank(pagerQuery.getOverdue())) {
+            if ("1".equals(pagerQuery.getOverdue())) {
+                qw.apply("date_format (h.actualDate,'%Y-%m-%d') <= date_format(p.dueDate,'%Y-%m-%d')");
+            } else if ("0".equals(pagerQuery.getOverdue())) {
+                qw.apply("date_format (h.actualDate,'%Y-%m-%d') > date_format(p.dueDate,'%Y-%m-%d')");
+            }
+        }
         if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {
             qw.like("p.vinNo", pagerQuery.getVinNo());
         }
+        if (StringUtils.isNotBlank(pagerQuery.getLoanContractNo())) {
+            qw.like("p.loanContractNo", pagerQuery.getLoanContractNo());
+        }
         if (StringUtils.isNotBlank(pagerQuery.getPeriod())) {
             qw.eq("p.period", pagerQuery.getPeriod());
         }
@@ -871,7 +900,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
     }
 
     public PagerVo<RepaymentStatisticsVo> repaymentStatistics(PagerQuery<RepaymentStatisticsQuery> pq) {
-        IPage<LoanRepaymentHistory> page = PagerUtil.queryToPage(pq);
+        PagerVo<RepaymentStatisticsVo> pagerVo = new PagerVo<>();
         RepaymentStatisticsQuery pagerQuery = pq.getParams();
         QueryWrapper<LoanRepaymentHistory> qw = new QueryWrapper<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -958,8 +987,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                 .orderBy(true, true, "a.period")
                 .orderBy(true, true, "a.loanContractNo")
         ;
-        IPage<RepaymentStatisticsVo> pagging = baseMapper.repaymentStatistics(page, qw);
-        List<RepaymentStatisticsVo> records = pagging.getRecords();
+        List<RepaymentStatisticsVo> records = baseMapper.repaymentStatistics(qw);
         records.removeAll(Collections.singleton(null));
         if (!records.isEmpty()) {
             for (RepaymentStatisticsVo record : records) {
@@ -1069,9 +1097,47 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                 }
             }).collect(Collectors.toList());
         }
-        pagging.setRecords(records);
-        PagerVo<RepaymentStatisticsVo> p = PagerUtil.pageToVo(pagging, null);
-        return p;
+
+
+        if (!records.isEmpty()) {
+            List<RepaymentStatisticsVo> lastList = this.pageBySubList(records, (int) pq.getSize(), (int) pq.getCurrent());
+            pagerVo.setRecords(lastList);
+            pagerVo.setTotal(records.size());
+            pagerVo.setCurrent(pq.getCurrent());
+            pagerVo.setSize(pq.getSize());
+            if (records.size() % pq.getSize() != 0L) {
+                pagerVo.setPages((records.size() / pq.getSize()) + 1);
+            } else {
+                pagerVo.setPages(records.size() / pq.getSize());
+            }
+            pagerVo.setMsg("当前共查询到" + records.size() + "条记录");
+        }
+        return pagerVo;
+    }
+
+    /**
+     * 分页方法
+     */
+    public List<RepaymentStatisticsVo> pageBySubList(List<RepaymentStatisticsVo> list, int pagesize, int currentPage) {
+        int totalcount = list.size();
+        int pagecount = 0;
+        List<RepaymentStatisticsVo> subList;
+        int m = totalcount % pagesize;
+        if (m > 0) {
+            pagecount = totalcount / pagesize + 1;
+        } else {
+            pagecount = totalcount / pagesize;
+        }
+        if (m == 0) {
+            subList = list.subList((currentPage - 1) * pagesize, pagesize * (currentPage));
+        } else {
+            if (currentPage == pagecount) {
+                subList = list.subList((currentPage - 1) * pagesize, totalcount);
+            } else {
+                subList = list.subList((currentPage - 1) * pagesize, pagesize * (currentPage));
+            }
+        }
+        return subList;
     }
 
     public PagerVo<RepaymentDetailsListVo> repaymentDetailsList(PagerQuery<RepaymentDetailsListQuery> pq) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyMapper.xml

@@ -43,7 +43,8 @@
         remarks,
         billNo,
         procDefId,
-        procInstId
+        procInstId,
+        date_format(closingDate, '%Y-%m-%d') as closingDate
         FROM loan_transfer_payment_apply
         <where>
             ${ew.sqlSegment}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java

@@ -288,6 +288,11 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
         qw.apply(StringUtils.isNotEmpty(applyStartTime), "date_format (applyDate,'%Y-%m-%d') >= date_format('" + applyStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(applyEndTime), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndTime + "','%Y-%m-%d')"
                 );
+        String closingStartDate = pagerQuery.getClosingStartDate();
+        String closingEndDate = pagerQuery.getClosingEndDate();
+        qw.apply(StringUtils.isNotEmpty(closingStartDate), "date_format (closingDate,'%Y-%m-%d') >= date_format('" + closingStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(closingEndDate), "date_format (closingDate,'%Y-%m-%d') <= date_format('" + closingEndDate + "','%Y-%m-%d')"
+                );
         qw.eq("isDelete", 0);
         qw.orderByDesc("createTime");
         IPage<LoanTransferPaymentApplyVo> pagging = baseMapper.listPage(page, qw);
@@ -574,6 +579,9 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
             }
             int i = updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+                LoanTransferPaymentApply apply = fetchBySid(businessSid);
+                apply.setClosingDate(new DateTime());
+                baseMapper.updateById(apply);
                 List<LoanTransferPaymentRecord> loanTransferPaymentRecords = loanTransferPaymentRecordService.selByMainSid(businessSid);
                 if (!loanTransferPaymentRecords.isEmpty()) {
                     for (LoanTransferPaymentRecord applyRecord : loanTransferPaymentRecords) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyService.java

@@ -30,18 +30,33 @@ import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.common.utils.Rule;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
+import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
+import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApply;
+import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyVo;
 import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo;
+import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDto;
+import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
+import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.*;
+import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDto;
+import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehFile;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
+import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate.LoanHomevisitInvestigateService;
+import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsService;
 import com.yxt.anrui.riskcenter.biz.loanvehclearanceveh.LoanVehClearanceVehService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import org.apache.commons.lang3.StringUtils;
@@ -55,6 +70,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -83,6 +100,16 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
 	private LoanFileService loanFileService;
 	@Autowired
 	private LoanVehClearanceVehService loanVehClearanceVehService;
+	@Autowired
+	private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
+	@Autowired
+	private BusSalesOrderFeign busSalesOrderFeign;
+	@Autowired
+	private LoanSolutionsService loanSolutionsService;
+	@Autowired
+	private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
+	@Autowired
+	private LoanHomevisitInvestigateService loanHomevisitInvestigateService;
 
 	public PagerVo<LoanVehClearanceApplyVo> listPageVo(PagerQuery<LoanVehClearanceApplyQuery> pq) {
 		LoanVehClearanceApplyQuery query = pq.getParams();
@@ -232,6 +259,61 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
 		LoanVehClearanceApply entity = fetchBySid(sid);
 		LoanVehClearanceApplyDetailsVo vo = new LoanVehClearanceApplyDetailsVo();
 		BeanUtil.copyProperties(entity, vo);
+		vo.setCreateTime(DateUtil.formatDate(entity.getCreateTime()));
+		List<LoanFile> loanFiles = loanFileService.selectByLinkSid(sid, LoanFileEnum.VEHCLEARANCE.getAttachType());
+		List<LoanVehClearanceFileVo> loanVehClearanceFileVos = new ArrayList<>();
+		if (loanFiles != null && loanFiles.size() > 0){
+			for (LoanFile loanFile : loanFiles) {
+				LoanVehClearanceFileVo loanVehClearanceFileVo = new LoanVehClearanceFileVo();
+				String filePath = loanFile.getFilePath();
+				String urlPrefix = fileUploadComponent.getUrlPrefix();
+				filePath = urlPrefix + filePath;
+				loanVehClearanceFileVo.setUrl(filePath);
+				loanVehClearanceFileVos.add(loanVehClearanceFileVo);
+			}
+		}
+		vo.setFiles(loanVehClearanceFileVos);
+		List<LoanVehClearanceVehDetailsVo> loanVehClearanceVehDetailsVoList = loanVehClearanceVehService.selByMainSid(sid);
+		for (LoanVehClearanceVehDetailsVo loanVehClearanceVehDetailsVo : loanVehClearanceVehDetailsVoList) {
+			List<LoanVehClearanceVehFile> loanVehClearanceVehFiles = new ArrayList<>();
+			BusSalesOrderVehicle busSalesOrderVehicle1 = busSalesOrderVehicleFeign.details(loanVehClearanceVehDetailsVo.getSaleVehSid()).getData();
+			BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle1.getSalesOrderSid()).getData();
+			//催收记录sid
+			LoanVehClearanceVehFile loanVehClearanceVehFile1 = new LoanVehClearanceVehFile();
+			loanVehClearanceVehFile1.setName("催收记录");
+			loanVehClearanceVehFile1.setSid(loanVehClearanceVehDetailsVo.getSaleVehSid());
+			loanVehClearanceVehFiles.add(loanVehClearanceVehFile1);
+			//开票管理sid
+			FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(busSalesOrderVehicle1.getLinkSid(), busSalesOrder.getContractNo()).getData();
+			LoanVehClearanceVehFile loanVehClearanceVehFile2 = new LoanVehClearanceVehFile();
+			loanVehClearanceVehFile2.setName("开票信息");
+			loanVehClearanceVehFile2.setSid(finVehicleInvoice.getSid());
+			loanVehClearanceVehFiles.add(loanVehClearanceVehFile2);
+			//月还明细sid
+			LoanVehClearanceVehFile loanVehClearanceVehFile3 = new LoanVehClearanceVehFile();
+			loanVehClearanceVehFile3.setName("月还明细");
+			loanVehClearanceVehFile3.setSid(loanVehClearanceVehDetailsVo.getSaleVehSid());
+			loanVehClearanceVehFiles.add(loanVehClearanceVehFile3);
+			//金融方案sid
+			LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(busSalesOrder.getSid());
+			LoanVehClearanceVehFile loanVehClearanceVehFile4 = new LoanVehClearanceVehFile();
+			loanVehClearanceVehFile4.setName("金融方案");
+			loanVehClearanceVehFile4.setSid(loanSolutions.getSid());
+			loanVehClearanceVehFiles.add(loanVehClearanceVehFile4);
+			//家访考察报告sid
+			String jfkcSid = loanHomevisitInvestigateService.selectByBorrSid(busSalesOrderVehicle1.getBorrowerSid());
+			LoanVehClearanceVehFile loanVehClearanceVehFile5 = new LoanVehClearanceVehFile();
+			loanVehClearanceVehFile5.setName("家访考察报告");
+			loanVehClearanceVehFile5.setSid(jfkcSid);
+			loanVehClearanceVehFiles.add(loanVehClearanceVehFile5);
+			//家访考察资料sid
+			LoanVehClearanceVehFile loanVehClearanceVehFile6 = new LoanVehClearanceVehFile();
+			loanVehClearanceVehFile6.setName("家访考察资料");
+			loanVehClearanceVehFile6.setSid(jfkcSid);
+			loanVehClearanceVehFiles.add(loanVehClearanceVehFile6);
+			loanVehClearanceVehDetailsVo.setSids(loanVehClearanceVehFiles);
+		}
+		vo.setLoanVehClearanceVehDetailsVoList(loanVehClearanceVehDetailsVoList);
 		return vo;
 	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehMapper.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDetailsVo;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -66,4 +67,7 @@ public interface LoanVehClearanceVehMapper extends BaseMapper<LoanVehClearanceVe
 
 	@Delete("delete from loan_veh_clearance_veh where mainSid = #{dtoSid}")
     void delByMainSid(String dtoSid);
+
+	@Select("select * from loan_veh_clearance_veh where mainSid = #{sid}")
+	List<LoanVehClearanceVehDetailsVo> selByMainSid(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehService.java

@@ -111,4 +111,8 @@ public class LoanVehClearanceVehService extends MybatisBaseService<LoanVehCleara
 	public void delByMainSid(String dtoSid) {
 		baseMapper.delByMainSid(dtoSid);
 	}
+
+	public List<LoanVehClearanceVehDetailsVo> selByMainSid(String sid) {
+		return baseMapper.selByMainSid(sid);
+	}
 }

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

@@ -33,5 +33,5 @@ public class AppMonRepayDetails extends BaseEntity {
     @ApiModelProperty("借款人名称")
     private String borrowerName;
     @ApiModelProperty("期数明细")
-    private List<AppMonRepayPeriodDetails> appMonRepayPeriodDetailsList;
+    private List<String> appMonRepayPeriodDetailsList;
 }

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

@@ -592,11 +592,16 @@ public class BeCollectionService {
         MonRepayDetails monRepayDetails = loanRepaymentPlanDetailsFeign.details(saleVehSid).getData();
         BeanUtil.copyProperties(monRepayDetails,appMonRepayDetails);
         List<MonRepayPeriodDetails> monRepayPeriodDetailsList = monRepayDetails.getMonRepayPeriodDetailsList();
-        List<AppMonRepayPeriodDetails> appMonRepayPeriodDetailsList = new ArrayList<>();
+        List<String> appMonRepayPeriodDetailsList = new ArrayList<>();
+        appMonRepayPeriodDetailsList.add("期数");
+        appMonRepayPeriodDetailsList.add("应还金额");
+        appMonRepayPeriodDetailsList.add("实还金额");
+        appMonRepayPeriodDetailsList.add("未还金额");
         for (MonRepayPeriodDetails monRepayPeriodDetails : monRepayPeriodDetailsList) {
-            AppMonRepayPeriodDetails appMonRepayPeriodDetails = new AppMonRepayPeriodDetails();
-            BeanUtil.copyProperties(monRepayPeriodDetails,appMonRepayPeriodDetails);
-            appMonRepayPeriodDetailsList.add(appMonRepayPeriodDetails);
+            appMonRepayPeriodDetailsList.add(monRepayPeriodDetails.getPeriod());
+            appMonRepayPeriodDetailsList.add(monRepayPeriodDetails.getDueMoney().toString());
+            appMonRepayPeriodDetailsList.add(monRepayPeriodDetails.getReceiptMoney().toString());
+            appMonRepayPeriodDetailsList.add(monRepayPeriodDetails.getNotRepaidMoney().toString());
         }
         appMonRepayDetails.setAppMonRepayPeriodDetailsList(appMonRepayPeriodDetailsList);
         return rb.success().setData(appMonRepayDetails);