交回车辆可入库

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

@@ -14,7 +14,7 @@ public class DownloadExcelVo {
 
     @ExportEntityMap(CnName = "财务中客户编码", EnName = "customerNo")
     private String customerNo;
-    @ExportEntityMap(CnName = "客户名称", EnName = "customerName")
+    @ExportEntityMap(CnName = "财务中客户名称", EnName = "customerName")
     private String customerName;
     @ExportEntityMap(CnName = "车架号", EnName = "vinNo")
     private String vinNo;

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

@@ -749,10 +749,10 @@ public class LoanOverdueFinService extends MybatisBaseService<LoanOverdueFinMapp
                         String word = new String();
                         switch (i) {
                             case 0:
-                                word = "客户编码";
+                                word = "财务中客户编码";
                                 break;
                             case 1:
-                                word = "客户名称";
+                                word = "财务中客户名称";
                                 break;
                             case 2:
                                 word = "车架号";
@@ -785,6 +785,9 @@ public class LoanOverdueFinService extends MybatisBaseService<LoanOverdueFinMapp
                 if (StringUtils.isBlank(excelFinVo.getTiredDeficiency())) {
                     checkWord.add("财务累欠金额不能为空");
                 }
+                if(!excelFinVo.getCustomerName().contains(excelFinVo.getVinNo())){
+                    checkWord.add("财务中客户名称"+excelFinVo.getCustomerName()+"不正确,请检查");
+                }
                 List<LoanRepaymentScheduleDetailsVo> loanRepaymentScheduleDetailsVos = loanOverdueFinDetailsService.selectByCustomerNo(excelFinVo.getCustomerNo(), useOrgSid);
                 loanRepaymentScheduleDetailsVos.removeAll(Collections.singleton(null));
                 if (loanRepaymentScheduleDetailsVos.isEmpty()) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java

@@ -30,8 +30,10 @@ import com.yxt.anrui.riskcenter.api.loanreturninboundapply.*;
 import com.yxt.anrui.riskcenter.api.loanreturninboundapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loanreturninboundtrailer.LoanReturnInboundTrailer;
 import com.yxt.anrui.riskcenter.api.loanreturninboundtrailer.LoanReturnInboundTrailerDto;
+import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger;
 import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService;
 import com.yxt.anrui.riskcenter.biz.loanreturninboundtrailer.LoanReturnInboundTrailerService;
+import com.yxt.anrui.riskcenter.biz.loanreturnvehledger.LoanReturnVehLedgerService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -81,6 +83,8 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
     private LoanRestoreReportApplyService loanRestoreReportApplyService;
     @Autowired
     private BaseVehmodelConfigFeign baseVehmodelConfigFeign;
+    @Autowired
+    private LoanReturnVehLedgerService loanReturnVehLedgerService;
 
     public PagerVo<LoanReturnInboundApplyVo> listPageVo(PagerQuery<LoanReturnInboundApplyQuery> pq) {
         LoanReturnInboundApplyQuery query = pq.getParams();
@@ -547,7 +551,9 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
                 loanReturnInboundApply = fetchBySid(businessSid);
                 loanReturnInboundApply.setCloseDate(DateUtil.today());
                 baseMapper.updateById(loanReturnInboundApply);
-                //
+                //推送到交回车辆台账
+                loanReturnVehLedgerService.saveVehLedger(businessSid);
+
             } else {
                 //极光推送
                 loanReturnInboundApply = fetchBySid(businessSid);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturnvehledger/LoanReturnVehLedgerMapper.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.riskcenter.biz.loanreturnvehledger;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/19
+ **/
+@Mapper
+public interface LoanReturnVehLedgerMapper extends BaseMapper<LoanReturnVehLedger> {
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturnvehledger/LoanReturnVehLedgerMapper.xml

@@ -0,0 +1,4 @@
+<?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.loanreturnvehledger.LoanReturnVehLedgerMapper">
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturnvehledger/LoanReturnVehLedgerService.java

@@ -1,5 +1,13 @@
 package com.yxt.anrui.riskcenter.biz.loanreturnvehledger;
 
+import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApply;
+import com.yxt.anrui.riskcenter.api.loanreturninboundtrailer.LoanReturnInboundTrailer;
+import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger;
+import com.yxt.anrui.riskcenter.biz.loanreturninboundapply.LoanReturnInboundApplyService;
+import com.yxt.anrui.riskcenter.biz.loanreturninboundtrailer.LoanReturnInboundTrailerService;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -8,5 +16,24 @@ import org.springframework.stereotype.Service;
  * @date: 2024/1/19
  **/
 @Service
-public class LoanReturnVehLedgerService {
+public class LoanReturnVehLedgerService extends MybatisBaseService<LoanReturnVehLedgerMapper, LoanReturnVehLedger> {
+
+
+    @Autowired
+    private LoanReturnInboundApplyService loanReturnInboundApplyService;
+    @Autowired
+    private LoanReturnInboundTrailerService loanReturnInboundTrailerService;
+
+    public ResultBean saveVehLedger(String businessSid) {
+        //查询交回入库申请办结的主车信息
+        LoanReturnInboundApply loanReturnInboundApply = loanReturnInboundApplyService.fetchBySid(businessSid);
+        LoanReturnInboundTrailer loanReturnInboundTrailer = null;
+        if ("是".equals(loanReturnInboundApply.getTralier())) {
+            //查询挂车信息
+            loanReturnInboundTrailer = loanReturnInboundTrailerService.selectByMainSid(businessSid);
+        }
+        //ToDo:查询该车是否已入库，若已入库则不重复入库
+
+        return null;
+    }
 }