逾期催收历史记录及详情查看接口开发

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordDetailsVo.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.riskcenter.api.loanbecollectionrecord;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
@@ -33,6 +34,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -54,6 +56,9 @@ public class LoanBeCollectionRecordDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("催收日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime; // 催收日期
     @ApiModelProperty("备注")
     private String remarks; // 备注
     @ApiModelProperty("创建人sid")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordFeign.java

@@ -77,7 +77,12 @@ public interface LoanBeCollectionRecordFeign {
     public ResultBean<LoanBeCollectionRecordDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
     @ApiOperation("初始化")
-    @GetMapping("/init/{saleVehSid}")
+    @GetMapping("/init")
     @ResponseBody
-    public ResultBean<LoanBeCollectionRecordInit> init(@PathVariable("saleVehSid") String saleVehSid);
+    public ResultBean<LoanBeCollectionRecordInit> init(@RequestParam("saleVehSid") String saleVehSid);
+
+    @ApiOperation("查看历史催收记录")
+    @GetMapping("/viewHistory")
+    @ResponseBody
+    public ResultBean<List<LoanBeCollectionRecordDetailsVo>> viewHistory(@RequestParam("saleVehSid") String saleVehSid);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordFeignFallback.java

@@ -74,4 +74,9 @@ public class LoanBeCollectionRecordFeignFallback implements LoanBeCollectionReco
 	public ResultBean<LoanBeCollectionRecordInit> init(String saleVehSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<LoanBeCollectionRecordDetailsVo>> viewHistory(String saleVehSid) {
+		return null;
+	}
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehVo.java

@@ -30,6 +30,8 @@ public class LoanBeOverdueVehVo implements Vo {
     private String bankContractNo;
     @ApiModelProperty("资方月还")
     private String dueMoney;
+    @ApiModelProperty("首次逾期日期")
+    private String firstBeDate;
     @ApiModelProperty("逾期期数")
     private String beOverduePeriod;
     @ApiModelProperty("逾期金额")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordMapper.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.loanbecollectionrecord.LoanBeCollectionRecordDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -62,4 +63,6 @@ public interface LoanBeCollectionRecordMapper extends BaseMapper<LoanBeCollectio
 	
 	@Select("select * from loan_be_collection_record")
 	List<LoanBeCollectionRecordVo> selectListVo();
+
+    List<LoanBeCollectionRecordDetailsVo> viewHistory(String saleVehSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordMapper.xml

@@ -1,13 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.riskcenter.biz.loanbecollectionrecord.LoanBeCollectionRecordMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordVo">
-		SELECT * FROM loan_be_collection_record <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordVo">
-		SELECT * FROM loan_be_collection_record <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordVo">
+        SELECT * FROM loan_be_collection_record
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo"
+            resultType="com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordVo">
+        SELECT * FROM loan_be_collection_record
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="viewHistory"
+            resultType="com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordDetailsVo">
+        SELECT sid,
+               createTime,
+               collectionTypeValue,
+               locationStr,
+               collectionResultValue,
+               contactsValue,
+               remarks
+        FROM loan_be_collection_record
+        WHERE saleVehSid = #{saleVehSid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordRest.java

@@ -96,7 +96,14 @@ public class LoanBeCollectionRecordRest implements LoanBeCollectionRecordFeign {
 	@Override
 	public ResultBean<LoanBeCollectionRecordInit> init(String saleVehSid) {
 		ResultBean rb = ResultBean.fireFail();
-		loanBeCollectionRecordService.init(saleVehSid);
-		return null;
+		LoanBeCollectionRecordInit loanBeCollectionRecordInit = loanBeCollectionRecordService.init(saleVehSid);
+		return rb.success().setData(loanBeCollectionRecordInit);
+	}
+
+	@Override
+	public ResultBean<List<LoanBeCollectionRecordDetailsVo>> viewHistory(String saleVehSid) {
+		ResultBean rb = ResultBean.fireFail();
+		List<LoanBeCollectionRecordDetailsVo> loanBeCollectionRecordDetailsVoList = loanBeCollectionRecordService.viewHistory(saleVehSid);
+		return rb.success().setData(loanBeCollectionRecordDetailsVoList);
 	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java

@@ -51,6 +51,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -151,6 +152,19 @@ public class LoanBeCollectionRecordService extends MybatisBaseService<LoanBeColl
 		LoanBeCollectionRecord entity = fetchBySid(sid);
 		LoanBeCollectionRecordDetailsVo vo = new LoanBeCollectionRecordDetailsVo();
 		BeanUtil.copyProperties(entity, vo);
+		List<LoanFile> loanFiles = loanFileService.selectByLinkSid(sid, LoanFileEnum.BECOLLECTIONRECORD.getAttachType());
+		List<LoanBeCollectionRecordFile> loanBeCollectionRecordFiles = new ArrayList<>();
+		if (loanFiles != null && loanFiles.size() > 0){
+			for (LoanFile loanFile : loanFiles) {
+				LoanBeCollectionRecordFile loanBeCollectionRecordFile = new LoanBeCollectionRecordFile();
+				String filePath = loanFile.getFilePath();
+				String urlPrefix = fileUploadComponent.getUrlPrefix();
+				filePath = urlPrefix + filePath;
+				loanBeCollectionRecordFile.setUrl(filePath);
+				loanBeCollectionRecordFiles.add(loanBeCollectionRecordFile);
+			}
+		}
+		vo.setLoanBeCollectionRecordFileList(loanBeCollectionRecordFiles);
 		return vo;
 	}
 
@@ -164,4 +178,9 @@ public class LoanBeCollectionRecordService extends MybatisBaseService<LoanBeColl
 		loanBeCollectionRecordInit.setSpouseMobile(loanHomevisitInvestigateCustomerDetailsVo.getSpouseMobile());
 		return loanBeCollectionRecordInit;
 	}
+
+	public List<LoanBeCollectionRecordDetailsVo> viewHistory(String saleVehSid) {
+		List<LoanBeCollectionRecordDetailsVo> loanBeCollectionRecordDetailsVoList = baseMapper.viewHistory(saleVehSid);
+		return loanBeCollectionRecordDetailsVoList;
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml

@@ -14,6 +14,7 @@
                a1.`bankName`,
                a1.`bankContractNo`,
                a1.dueMoney      AS bankMonthRep,
+               a1.dueDate       AS firstBeDate,
                COUNT(a1.sid)    AS beOverduePeriod,
                SUM(a1.yq_total) AS beOverdueMoney,
                SUM(a1.yq_hsqs)  AS beOverdueMoneyAndPeriod,
@@ -29,6 +30,7 @@
                      lrpd.`bankName`,
                      lrpd.`bankContractNo`,
                      lrpd.dueMoney,
+                     lrpd.dueDate,
                      (
                              lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
                              )                   AS yq_total,