优化

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java

@@ -75,6 +75,6 @@ public interface BusSalesOrderLoancontractMapper extends BaseMapper<BusSalesOrde
 
     IPage<BusLoancontractForRepayVo> listPageForRepay(IPage<BusSalesOrderLoancontract> page,@Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderLoancontract> qw);
 
-    @Update("update bus_sales_order_loancontract set bankContractNo=#{bankContractNo},busNo='305' where sid=#{loanContractSid}")
+    @Update("update bus_sales_order_loancontract set bankContractNo=#{bankContractNo},busNo='305',busName='放款资料审核' where sid=#{loanContractSid}")
     void updateBankConAndBusNo(@Param("loanContractSid") String loanContractSid,@Param("bankContractNo") String bankContractNo);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -2660,7 +2660,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
                     BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finBillApplication.getContractNo(), finBillVehicleVo.getVehSid()).getData();
                     baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
-                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKKPTJ.getTypeKey());
+                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKKPZZ.getTypeKey());
                     baseVehicleStateDtos.add(baseVehicleStateDto);
                 }
                 baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos);
@@ -2682,7 +2682,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                         BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
                         BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finBillApplication.getContractNo(), finBillVehicleVo.getVehSid()).getData();
                         baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
-                        baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKKPTJ.getTypeKey());
+                        baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKKPZZ.getTypeKey());
                         baseVehicleStateDtos.add(baseVehicleStateDto);
                     }
                     baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos);

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineQuery.java

@@ -69,6 +69,8 @@ public class LoanHomevisitFileexamineQuery implements Query {
     private String contractNo;
     @ApiModelProperty("贷款人名称")
     private String loanPeoName;
+    @ApiModelProperty("资方名称")
+    private String bankName;
     @ApiModelProperty("金融产品名称")
     private String policyName;
     @ApiModelProperty("家访专员姓名")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineVo.java

@@ -26,12 +26,16 @@
 package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * Project: anrui-riskcenter(家访资料审核) <br/>
  * File: LoanHomevisitFileexamineVo.java <br/>
@@ -71,6 +75,8 @@ public class LoanHomevisitFileexamineVo implements Vo {
     private String borrowerName;
     @ApiModelProperty("手机号码")
     private String mobile;
+    @ApiModelProperty("资方名称")
+    private String bankName;
     @ApiModelProperty("金融产品名称")
     private String policyName;
     @ApiModelProperty("家访专员姓名")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanAttachTypeEnum.java

@@ -29,7 +29,7 @@ public enum LoanAttachTypeEnum {
     GZSFP("020", "购置税发票"),
     BXFP("021", "保险发票"),
     BD("022", "保单"),
-    RZ("023", "融资合同"),
+    RZHT("023", "融资合同"),
     ZMFJ("024", "证明附件"),
     ;
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java

@@ -235,6 +235,33 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
 			}
 		}
 		vo.setBxfpImages(bxfpImages);
+		//保单
+		List<LoanHomevisitInvestigateFileDetailsVo> bdVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.BD.getAttachType());
+		List<String> bdImages = new ArrayList<>();
+		if (bdVos != null && bdVos.size() > 0){
+			for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : bdVos) {
+				bdImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
+			}
+		}
+		vo.setBdImages(bdImages);
+		//融资合同
+		List<LoanHomevisitInvestigateFileDetailsVo> rzhtVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.RZHT.getAttachType());
+		List<String> rzhtImages = new ArrayList<>();
+		if (rzhtVos != null && rzhtVos.size() > 0){
+			for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : rzhtVos) {
+				rzhtImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
+			}
+		}
+		vo.setRzhtImages(rzhtImages);
+		//证明附件
+		List<LoanHomevisitInvestigateFileDetailsVo> zmfjVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.ZMFJ.getAttachType());
+		List<String> zmfjImages = new ArrayList<>();
+		if (zmfjVos != null && zmfjVos.size() > 0){
+			for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : zmfjVos) {
+				zmfjImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
+			}
+		}
+		vo.setZmfjImages(zmfjImages);
 		return vo;
 	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineMapper.xml

@@ -15,6 +15,7 @@
         bo.`contractNo`,
         bb.`borrowerName`,
         bb.`mobile`,
+        bb.bankName,
         bb.`policyName`,
         li.`homeVisStaffName`,
         li.investigateValue

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java

@@ -149,6 +149,9 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         if (StringUtils.isNotBlank(query.getLoanPeoName())) {
             qw.like("bb.borrowerName", query.getLoanPeoName());
         }
+        if (StringUtils.isNotBlank(query.getBankName())) {
+            qw.like("bb.bankName", query.getBankName());
+        }
         if (StringUtils.isNotBlank(query.getPolicyName())) {
             qw.like("bb.policyName", query.getPolicyName());
         }
@@ -411,6 +414,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         }
         LoanHomevisitFileexamine entity = fetchBySid(dtoSid);
         BeanUtil.copyProperties(dto, entity, "id", "sid");
+        entity.setState(2);
         baseMapper.updateById(entity);
     }
 
@@ -445,10 +449,10 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
             if (StringUtils.isBlank(busSalesOrderLoancontractDetailsVo.getBankContractNo())) {
                 loanZfConDetailsVo.setBankContractNoShow(busSalesOrderBorrowerDetailsVo.getBorrowerName() + "(暂无)");
             } else {
-                loanZfConDetailsVo.setBankContractNo(busSalesOrderLoancontractDetailsVo.getLoanContractNo());
+                loanZfConDetailsVo.setBankContractNo(busSalesOrderLoancontractDetailsVo.getBankContractNo());
                 loanZfConDetailsVo.setBankContractNoShow(busSalesOrderBorrowerDetailsVo.getBorrowerName() + "(" + busSalesOrderLoancontractDetailsVo.getBankContractNo() + ")");
                 //资方合同附件
-                List<LoanHomevisitInvestigateFileDetailsVo> loanHomevisitInvestigateFileDetailsVos2 = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), busSalesOrderLoancontractDetailsVo.getLoanContractNo());
+                List<LoanHomevisitInvestigateFileDetailsVo> loanHomevisitInvestigateFileDetailsVos2 = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), busSalesOrderLoancontractDetailsVo.getBankContractNo());
                 if (loanHomevisitInvestigateFileDetailsVos2 != null && loanHomevisitInvestigateFileDetailsVos2.size() > 0) {
                     for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : loanHomevisitInvestigateFileDetailsVos2) {
                         bankContractImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());