垫款导入按照导入信息查询业务系统数据按照规定格式返回数据

开票详情展示资方信审终审状态

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyFeign.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.api.loanbepadsincereapply;
 
+import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.RepaymentExcelInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,5 +85,5 @@ public interface LoanBePadsincereApplyFeign {
     @ApiOperation(value = "导入")
     @PostMapping("/getExcelInfo")
     @ResponseBody
-    public ResultBean<List<BePadsincereExcelInfo>> getExcelInfo(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request) throws IOException, ParseException;
+    public ResultBean<List<LoanBePadsincereVehDetailsVo>> getExcelInfo(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request) throws IOException, ParseException;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVeh.java

@@ -64,12 +64,6 @@ public class LoanBePadsincereVeh extends BaseEntity {
     private String borrowerName; // 贷款人名称
 	@ApiModelProperty("期数")
     private String period; // 期数
-	@ApiModelProperty("应还日期")
-    private String payableDate; // 应还日期
-	@ApiModelProperty("应还金额")
-    private String payableMoney; // 应还金额
-	@ApiModelProperty("已还金额")
-    private String yhMoney; // 已还金额
 	@ApiModelProperty("系统逾期金额")
     private String sysBeMoney; // 系统逾期金额
 	@ApiModelProperty("资方逾期金额")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehDetailsVo.java

@@ -65,12 +65,6 @@ public class LoanBePadsincereVehDetailsVo implements Vo {
     private String borrowerName; // 贷款人名称
 	@ApiModelProperty("期数")
     private String period; // 期数
-	@ApiModelProperty("应还日期")
-    private String payableDate; // 应还日期
-	@ApiModelProperty("应还金额")
-    private String payableMoney; // 应还金额
-	@ApiModelProperty("已还金额")
-    private String yhMoney; // 已还金额
 	@ApiModelProperty("系统逾期金额")
     private String sysBeMoney; // 系统逾期金额
 	@ApiModelProperty("资方逾期金额")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehDto.java

@@ -65,12 +65,6 @@ public class LoanBePadsincereVehDto implements Dto {
     private String borrowerName; // 贷款人名称
 	@ApiModelProperty("期数")
     private String period; // 期数
-	@ApiModelProperty("应还日期")
-    private String payableDate; // 应还日期
-	@ApiModelProperty("应还金额")
-    private String payableMoney; // 应还金额
-	@ApiModelProperty("已还金额")
-    private String yhMoney; // 已还金额
 	@ApiModelProperty("系统逾期金额")
     private String sysBeMoney; // 系统逾期金额
 	@ApiModelProperty("资方逾期金额")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehQuery.java

@@ -63,12 +63,6 @@ public class LoanBePadsincereVehQuery implements Query {
     private String borrowerName; // 贷款人名称
 	@ApiModelProperty("期数")
     private String period; // 期数
-	@ApiModelProperty("应还日期")
-    private String payableDate; // 应还日期
-	@ApiModelProperty("应还金额")
-    private String payableMoney; // 应还金额
-	@ApiModelProperty("已还金额")
-    private String yhMoney; // 已还金额
 	@ApiModelProperty("系统逾期金额")
     private String sysBeMoney; // 系统逾期金额
 	@ApiModelProperty("资方逾期金额")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehVo.java

@@ -65,12 +65,6 @@ public class LoanBePadsincereVehVo implements Vo {
     private String borrowerName; // 贷款人名称
 	@ApiModelProperty("期数")
     private String period; // 期数
-	@ApiModelProperty("应还日期")
-    private String payableDate; // 应还日期
-	@ApiModelProperty("应还金额")
-    private String payableMoney; // 应还金额
-	@ApiModelProperty("已还金额")
-    private String yhMoney; // 已还金额
 	@ApiModelProperty("系统逾期金额")
     private String sysBeMoney; // 系统逾期金额
 	@ApiModelProperty("资方逾期金额")

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

@@ -0,0 +1,19 @@
+package com.yxt.anrui.riskcenter.api.loanrepaymentschedule;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class LoanRepaymentScheduleDetailsVo {
+
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("消贷合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("资方名称")
+    private String bankName;
+    @ApiModelProperty("借款人名称")
+    private String borrowerName;
+    @ApiModelProperty("销售订单sid")
+    private String salesOrderSid;
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyRest.java

@@ -29,6 +29,7 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
 import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.*;
 import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVeh;
+import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.RepaymentExcelInfo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -115,7 +116,7 @@ public class LoanBePadsincereApplyRest implements LoanBePadsincereApplyFeign {
 	}
 
 	@Override
-	public ResultBean<List<BePadsincereExcelInfo>> getExcelInfo(MultipartFile file, HttpServletRequest request) throws IOException {
+	public ResultBean<List<LoanBePadsincereVehDetailsVo>> getExcelInfo(MultipartFile file, HttpServletRequest request) throws IOException {
 		return loanBePadsincereApplyService.getExcelInfo(file, request);
 	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java

@@ -28,10 +28,16 @@ package com.yxt.anrui.riskcenter.biz.loanbepadsincereapply;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.*;
+import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.RepaymentExcelInfo;
+import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanCreateScheduleVinsVo;
+import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleDetailsVo;
+import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentschedule.LoanRepaymentScheduleService;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -81,7 +87,11 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
     @Autowired
     private SysUserFeign sysUserFeign;
     @Autowired
+    private BusSalesOrderFeign busSalesOrderFeign;
+    @Autowired
     private LoanRepaymentScheduleService loanRepaymentScheduleService;
+    @Autowired
+    private LoanRepaymentPlanDetailsService loanRepaymentPlanDetailsService;
 
     public PagerVo<LoanBePadsincereApplyVo> listPageVo(PagerQuery<LoanBePadsincereApplyQuery> pq) {
         LoanBePadsincereApplyQuery query = pq.getParams();
@@ -176,7 +186,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
         return vo;
     }
 
-	public ResultBean<List<BePadsincereExcelInfo>> getExcelInfo(MultipartFile file, HttpServletRequest request) throws IOException {
+    public ResultBean<List<LoanBePadsincereVehDetailsVo>> getExcelInfo(MultipartFile file, HttpServletRequest request) throws IOException {
         ResultBean rb = ResultBean.fireFail();
         String temp = request.getSession().getServletContext().getRealPath(File.separator) + "temp";// 临时目录
         File tempFile = new File(temp);
@@ -190,6 +200,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
 
         int[] resultCell = new int[]{0, 1, 2, 3, 4, 5, 6, 7};
         List<BePadsincereExcelInfo> resultList = new ArrayList<>();
+        List<LoanBePadsincereVehDetailsVo> resultList2 = new ArrayList<>();
         boolean isExcel2003 = true;
         if (fileName.matches("^.+\\.(?i)(xlsx)$")) {
             isExcel2003 = false;
@@ -204,17 +215,37 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
         Sheet sheet = wb.getSheetAt(0);
         ReturnExcelInfo importReturn = getSheetVal(sheet, resultCell);
         resultList = importReturn.getInfos();
-		System.out.println("结果是--->" + resultList);
+        for (BePadsincereExcelInfo bePadsincereExcelInfo : resultList) {
-		importReturn.setInfos(resultList);
+            List<LoanRepaymentScheduleDetailsVo> loanRepaymentScheduleDetailsVos = loanRepaymentScheduleService.selectByBankContractNo(bePadsincereExcelInfo.getBankContractNo());
-		if (!resultList.isEmpty()) {
+            for (LoanRepaymentScheduleDetailsVo loanRepaymentScheduleDetailsVo : loanRepaymentScheduleDetailsVos) {
-			if (StringUtils.isNotBlank(importReturn.getCheckInfo2())) {
+                String vinNo = loanRepaymentScheduleDetailsVo.getVinNo();
-				return rb.success().setData(resultList).setMsg(importReturn.getCheckInfo2());
+                String[] vinNos = vinNo.split(",");
-			} else {
+                for (String no : vinNos) {
-				return rb.success().setData(resultList).setMsg("成功导入数据，请点击确定按钮");
+                    LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo = new LoanBePadsincereVehDetailsVo();
+                    loanBePadsincereVehDetailsVo.setVinNo(no);
+                    loanBePadsincereVehDetailsVo.setLoanContractNo(loanRepaymentScheduleDetailsVo.getLoanContractNo());
+                    loanBePadsincereVehDetailsVo.setBankName(loanRepaymentScheduleDetailsVo.getBankName());
+                    loanBePadsincereVehDetailsVo.setBankContractNo(bePadsincereExcelInfo.getBankContractNo());
+                    BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanRepaymentScheduleDetailsVo.getSalesOrderSid()).getData();
+                    loanBePadsincereVehDetailsVo.setCustomerName(busSalesOrder.getCustomerName());
+                    loanBePadsincereVehDetailsVo.setBorrowerName(loanRepaymentScheduleDetailsVo.getBorrowerName());
+                    loanBePadsincereVehDetailsVo.setPeriod(bePadsincereExcelInfo.getPeriod());
+                    String sysBeMoney = loanRepaymentPlanDetailsService.selBeMoney(no, bePadsincereExcelInfo.getPeriod(), bePadsincereExcelInfo.getBankContractNo());
+                    loanBePadsincereVehDetailsVo.setSysBeMoney(sysBeMoney);
+                    loanBePadsincereVehDetailsVo.setBankBeMoney(bePadsincereExcelInfo.getBePrincipal());
+                    loanBePadsincereVehDetailsVo.setBankBeInter(bePadsincereExcelInfo.getBeDefInter());
+                    loanBePadsincereVehDetailsVo.setPaymentAccount(bePadsincereExcelInfo.getPaymentAccount());
+                    loanBePadsincereVehDetailsVo.setPaymentNum(bePadsincereExcelInfo.getPaymentNum());
+                    loanBePadsincereVehDetailsVo.setBankCollectionAcc(bePadsincereExcelInfo.getBankCollectionAcc());
+                    loanBePadsincereVehDetailsVo.setBankCollectionNum(bePadsincereExcelInfo.getBankCollectionNum());
+                    resultList2.add(loanBePadsincereVehDetailsVo);
                 }
+            }
+        }
+        if (StringUtils.isNotBlank(importReturn.getCheckInfo2())) {
+            return rb.success().setData(resultList2).setMsg(importReturn.getCheckInfo2());
         } else {
-			String checkResult = importReturn.getCheckInfo();
+            return rb.success().setData(resultList2).setMsg("成功导入数据，请点击确定按钮");
-			return rb.success().setData(resultList).setMsg(checkResult);
         }
     }
 
@@ -331,8 +362,8 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
                 if (StringUtils.isBlank(excelInfo.getBankCollectionNum())) {
                     checkWord.add("资方收款账号不能为空");
                 }
-				int i = loanRepaymentScheduleService.selectByBankContractNo(excelInfo.getBankContractNo());
+                List<LoanRepaymentScheduleDetailsVo> loanRepaymentScheduleDetailsVos = loanRepaymentScheduleService.selectByBankContractNo(excelInfo.getBankContractNo());
-				if (i == 0){
+                if (loanRepaymentScheduleDetailsVos == null || loanRepaymentScheduleDetailsVos.size() == 0) {
                     checkWord.add("资方合同号" + excelInfo.getBankContractNo() + "在还款计划表中不存在");
                 }
             }

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

@@ -27,4 +27,6 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper<LoanRepayment
     int deletePlanDetails(String scheduleSid);
 
     List<LoanRepaymentPlanDetails> selPlanByNoAndPeriod(@Param("bankContractNo") String bankContractNo, @Param("period") String period);
+
+    String selBeMoney(@Param("no") String no,@Param("period") String period,@Param("bankContractNo") String bankContractNo);
 }

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

@@ -1,8 +1,6 @@
 <?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.loanrepaymentplandetails.LoanRepaymentPlanDetailsMapper">
-
-
     <delete id="deletePlanDetails">
         DELETE
         FROM loan_repayment_plan_details
@@ -16,4 +14,18 @@
           and `period` = #{period}
                 -- and policyOrOther = '0'
     </select>
+
+    <select id="selBeMoney" resultType="java.lang.String">
+        SELECT (
+                       lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
+                       ) AS yq_total
+        FROM `loan_repayment_plan_details` lrpd
+                     LEFT JOIN `loan_repayment_history` lrh
+                ON lrh.planDetailSid = lrpd.`sid`
+        WHERE lrpd.vinNo = #{no}
+          AND lrpd.period = #{period}
+          AND lrpd.loanContractNo = #{loanContractNo}
+        GROUP BY lrpd.`sid`
+        HAVING (yq_total > 0)
+    </select>
 </mapper>

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

@@ -89,4 +89,7 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
         return baseMapper.selPlanByNoAndPeriod(bankContractNo,period);
     }
 
+    public String selBeMoney(String no, String period, String bankContractNo) {
+        return baseMapper.selBeMoney(no,period,bankContractNo);
+    }
 }

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

@@ -4,11 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.loanparameter.LoanParameter;
+import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.*;
-import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
-import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.AppRepaymentPlanVo;
-import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule;
-import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.ScanRepaymentVo;
 import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformation;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -32,6 +28,5 @@ public interface LoanRepaymentScheduleMapper extends BaseMapper<LoanRepaymentSch
 
     List<ScanRepaymentVo> scanRepayment();
 
-    @Select("SELECT COUNT(*) FROM loan_repayment_schedule WHERE bankContractNo = #{bankContractNo}")
+    List<LoanRepaymentScheduleDetailsVo> selectByBankContractNo(String bankContractNo);
-    int selectByBankContractNo(String bankContractNo);
 }

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

@@ -1,7 +1,6 @@
 <?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.loanrepaymentschedule.LoanRepaymentScheduleMapper">
-
     <select id="selectByContractSid"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule">
         select *
@@ -39,4 +38,15 @@
         WHERE curdate() &lt;= mainLastDate
           and isDelete = 0
     </select>
+
+    <select id="selectByBankContractNo"
+            resultType="com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleDetailsVo">
+        SELECT loanContractNo,
+               vinNo,
+               bankName,
+               borrowerName,
+               salesOrderSid
+        FROM loan_repayment_schedule
+        WHERE bankContractNo = #{bankContractNo}
+    </select>
 </mapper>

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

@@ -2036,7 +2036,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         return rb.success();
     }
 
-    public int selectByBankContractNo(String bankContractNo) {
+    public List<LoanRepaymentScheduleDetailsVo> selectByBankContractNo(String bankContractNo) {
         return baseMapper.selectByBankContractNo(bankContractNo);
     }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@@ -255,8 +255,10 @@ public class InvoicedService {
             vinListVo.setZcHgzImages(finBillVehicle.getCertificatePhoto());
             if (StringUtils.isNotBlank(finBillVehicle.getXSState())){
                 vinListVo.setXSState(finBillVehicle.getXSState());
-                vo.setShowXsState(true);
+            }else {
+                vinListVo.setXSState("-");
             }
+            vo.setShowXsState(true);
             vinListVos.add(vinListVo);
         }
         vo.setVinList(vinListVos);