Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java

@@ -34,7 +34,7 @@ public interface BaseVehicleStateFeign {
     @ResponseBody
     ResultBean<BaseVehicleState> selectOneQKKPByBusSid(@RequestParam("busSid") String sid);
 
-    @PostMapping("selectByVinSid")
+    @PostMapping("selectByBusSid")
     @ResponseBody
-    ResultBean<BaseVehicleState> selectByVinSid(@RequestParam("vehSid") String vehSid);
+    ResultBean<BaseVehicleState> selectByBusSid(@RequestParam("busSid") String busSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java

@@ -22,5 +22,5 @@ public interface BaseVehicleStateMapper extends BaseMapper<BaseVehicleState> {
 
     BaseVehicleState selectOneQKKPByBusSid(String sid);
 
-    BaseVehicleState selectByVinSid(String vehSid);
+    BaseVehicleState selectByBusSid(String busSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml

@@ -33,10 +33,10 @@
           AND busState = '401'
     </select>
 
-    <select id="selectByVinSid" resultType="com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState">
+    <select id="selectByBusSid" resultType="com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState">
         SELECT *
         FROM base_vehicle_state
-        WHERE vinSid = #{vehSid}
+        WHERE busSid = #{busSid}
           AND carryVehicleState = '0'
           AND carryInvoiceState = '0'
     </select>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java

@@ -41,8 +41,8 @@ public class BaseVehicleStateRest implements BaseVehicleStateFeign {
     }
 
     @Override
-    public ResultBean<BaseVehicleState> selectByVinSid(String vehSid) {
-        return baseVehicleStateService.selectByVinSid(vehSid);
+    public ResultBean<BaseVehicleState> selectByBusSid(String busSid) {
+        return baseVehicleStateService.selectByBusSid(busSid);
     }
 
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java

@@ -188,9 +188,9 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
         return rb.success().setData(baseVehicleState);
     }
 
-    public ResultBean<BaseVehicleState> selectByVinSid(String vehSid) {
+    public ResultBean<BaseVehicleState> selectByBusSid(String busSid) {
         ResultBean<BaseVehicleState> rb = ResultBean.fireFail();
-        BaseVehicleState baseVehicleState = baseMapper.selectByVinSid(vehSid);
+        BaseVehicleState baseVehicleState = baseMapper.selectByBusSid(busSid);
         return rb.success().setData(baseVehicleState);
     }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java

@@ -38,6 +38,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -166,6 +167,8 @@ public class FinBillApplicationDetailsVo extends AppBillApplicationIInfoVo imple
     private List<FinBillFileVo> fjApplicationAppendxs;
     @ApiModelProperty("证件")
     private List<FinBillFileVo> zjApplicationAppendxs; // 证件
+    @ApiModelProperty("车辆买卖合同附件信息")
+    private List<FinBillFileVo> carBuyContractImages;
     @ApiModelProperty("客户开票申请书")
     private List<FinBillFileVo> khkpsqsApplicationAppendxs; // 客户开票申请书
     @ApiModelProperty("开票信息确认书")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java

@@ -153,6 +153,8 @@ public class FinBillApplicationDto implements Dto {
     private List<FinBillVehicleDto> finBillVehicles;
     @ApiModelProperty("开票挂车信息")
     private List<FinBillTrailerDto> finBillTrailers;
+    @ApiModelProperty("车辆买卖合同附件信息")
+    private List<FinBillFileDto> carBuyContractImages = new ArrayList<>();
     @ApiModelProperty("客户开票申请书附件信息")
     private List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>();
     @ApiModelProperty("款项确认书附件信息")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/flowable/FinBillCompleteDto.java

@@ -39,6 +39,8 @@ public class FinBillCompleteDto implements Dto {
     @NotBlank(message = "参数错误：businessSid")
     private String businessSid;
 
+    @ApiModelProperty("车辆买卖合同")
+    private List<FinBillFileDto> carBuyContractImages = new ArrayList<>();
     @ApiModelProperty("客户开票申请书附件信息")
     private List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>();
     @ApiModelProperty("款项确认书附件信息")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinAttachTypeEnum.java

@@ -12,7 +12,8 @@ public enum FinAttachTypeEnum {
     CLDJHT("003", "车辆登记合同"),
     ZJ("004", "证件"),
     FJ("005", "附件"),
-    QKLPFJ("006", "欠款领票附件");
+    QKLPFJ("006", "欠款领票附件"),
+    CLMMHT("007", "车辆买卖合同");
 
     /**
      * 附件类型

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

@@ -385,6 +385,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         String dtoSid = dto.getSid();
         List<FinBillTrailerDto> finBillTrailers = dto.getFinBillTrailers();
         List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
+        List<FinBillFileDto> carBuyContractImages = dto.getCarBuyContractImages();
         List<FinBillFileDto> khkpsqsApplicationAppendxs = dto.getKhkpsqsApplicationAppendxs();
         List<FinBillFileDto> kpxxqrsApplicationAppendxs = dto.getKpxxqrsApplicationAppendxs();
         List<FinBillFileDto> cldjhtApplicationAppendxs = dto.getCldjhtApplicationAppendxs();
@@ -415,6 +416,16 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 }
             }
             //附件信息
+            for (FinBillFileDto finBillFileDto : carBuyContractImages) {
+                String filePath = finBillFileDto.getFileUrl();
+                if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                    filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                finBillFileDto.setFileUrl(filePath);
+                finBillFileDto.setBillAppSid(finBillApplication.getSid());
+                finBillFileDto.setAttachType(FinAttachTypeEnum.CLMMHT.getAttachType());
+                finBillFileService.saveOrUpdateDto(finBillFileDto);
+            }
             for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) {
                 String filePath = finBillFileDto.getFileUrl();
                 if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -465,6 +476,18 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         updateByDto(dto);
         finBillFileService.deleteByFinAppSid(dtoSid);
         //附件信息
+        if (carBuyContractImages != null) {
+            for (FinBillFileDto finBillFileDto : carBuyContractImages) {
+                String filePath = finBillFileDto.getFileUrl();
+                if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                    filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                finBillFileDto.setFileUrl(filePath);
+                finBillFileDto.setBillAppSid(finBillApplication.getSid());
+                finBillFileDto.setAttachType(FinAttachTypeEnum.CLMMHT.getAttachType());
+                finBillFileService.saveOrUpdateDto(finBillFileDto);
+            }
+        }
         if (khkpsqsApplicationAppendxs != null) {
             for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) {
                 String filePath = finBillFileDto.getFileUrl();
@@ -598,6 +621,13 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             }
             vo.setFinBillTrailers(finBillTrailerVos);
         }
+        List<FinBillFileVo> clmmhtApplicationAppendxs = finBillFileService.fetchclmmhtBySid(sid);
+        for (FinBillFileVo clmmhtApplicationAppendx : clmmhtApplicationAppendxs) {
+            String fileUrl = clmmhtApplicationAppendx.getFileUrl();
+            String urlPrefix = fileUploadComponent.getUrlPrefix();
+            fileUrl = urlPrefix + fileUrl;
+            clmmhtApplicationAppendx.setFileUrl(fileUrl);
+        }
         List<FinBillFileVo> khkpsqsApplicationAppendxs = finBillFileService.fetchkhkpsqsBySid(sid);
         for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) {
             String fileUrl = khkpsqsApplicationAppendx.getFileUrl();
@@ -640,6 +670,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             fileUrl = urlPrefix + fileUrl;
             arrearsCollectionAppendx.setFileUrl(fileUrl);
         }
+        vo.setCarBuyContractImages(clmmhtApplicationAppendxs);
         vo.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs);
         vo.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs);
         vo.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
@@ -2018,7 +2049,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         ResultBean rb = ResultBean.fireFail();
         List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
         for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
-            BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectByVinSid(finBillVehicle.getVehSid()).getData();
+            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(dto.getContractNo(), finBillVehicle.getVehSid()).getData();
+            BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectByBusSid(busSalesOrderVehicle.getSid()).getData();
             if (baseVehicleState == null){
                 return rb.setMsg("车架号" + finBillVehicle.getVinNo() + "已发起过欠款提车或欠款开票，请重新选择");
             }
@@ -3434,6 +3466,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     public ResultBean completeByKP(BusinessVariables bv, FinBillCompleteDto query) {
         ResultBean rb = ResultBean.fireFail();
         String businessSid = bv.getBusinessSid();
+        List<FinBillFileDto> carBuyContractImages = query.getCarBuyContractImages();
         List<FinBillFileDto> khkpsqsApplicationAppendxs = query.getKhkpsqsApplicationAppendxs();
         List<FinBillFileDto> kpxxqrsApplicationAppendxs = query.getKpxxqrsApplicationAppendxs();
         List<FinBillFileDto> cldjhtApplicationAppendxs = query.getCldjhtApplicationAppendxs();
@@ -3475,6 +3508,18 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             //更新图片
             finBillFileService.deleteByFinAppSid(businessSid);
             //附件信息
+            if (carBuyContractImages.size() > 0) {
+                for (FinBillFileDto finBillFileDto : carBuyContractImages) {
+                    String filePath = finBillFileDto.getFileUrl();
+                    if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                        filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+                    }
+                    finBillFileDto.setFileUrl(filePath);
+                    finBillFileDto.setBillAppSid(businessSid);
+                    finBillFileDto.setAttachType(FinAttachTypeEnum.CLMMHT.getAttachType());
+                    finBillFileService.saveOrUpdateDto(finBillFileDto);
+                }
+            }
             if (khkpsqsApplicationAppendxs.size() > 0) {
                 for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) {
                     String filePath = finBillFileDto.getFileUrl();

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java

@@ -92,5 +92,8 @@ public interface FinBillFileMapper extends BaseMapper<FinBillFile> {
 	@Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '006'")
 	List<FinBillFileVo> fetchqklpfjBySid(String sid);
 
+	@Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '007'")
+	List<FinBillFileVo> fetchclmmhtBySid(String sid);
+
 	List<FinBillFileVo> fetchFileByBillSid(@Param("sid") String sid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java

@@ -173,4 +173,8 @@ public class FinBillFileService extends MybatisBaseService<FinBillFileMapper, Fi
     public List<FinBillFileVo> fetchqklpfjBySid(String sid) {
         return baseMapper.fetchqklpfjBySid(sid);
     }
+
+    public List<FinBillFileVo> fetchclmmhtBySid(String sid) {
+        return baseMapper.fetchclmmhtBySid(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateInitCustomerVo.java

@@ -68,6 +68,4 @@ public class LoanHomeVisitInvestigateInitCustomerVo implements Vo {
     private String emergencyContactType;
     @ApiModelProperty("紧急联系人类型key")
     private String emergencyContactTypeKey;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateSaveCustomerDto.java

@@ -68,6 +68,4 @@ public class LoanHomeVisitInvestigateSaveCustomerDto implements Dto {
     private String emergencyContactType;
     @ApiModelProperty("紧急联系人类型key")
     private String emergencyContactTypeKey;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

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

@@ -20,6 +20,4 @@ public class LoanHomeVisitInvestigateInitJFJZVo implements Vo {
     private List<String> indoor;
     @ApiModelProperty("合影照等")
     private List<String> groupPhoto;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

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

@@ -16,6 +16,4 @@ public class LoanHomeVisitInvestigateInitZCLVo implements Vo {
     private List<String> houseProperty;
     @ApiModelProperty("车辆")
     private List<String> carProperty;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

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

@@ -30,6 +30,4 @@ public class LoanHomeVisitInvestigateInitZMWJVo implements Vo {
     private List<String> guarantorAccount;
     @ApiModelProperty("是否有配偶")
     private Boolean spouseState = true;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

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

@@ -21,6 +21,4 @@ public class LoanHomeVisitInvestigateSaveJFJZDto implements Vo {
     private List<String> indoor = new ArrayList<>();;
     @ApiModelProperty("合影照等")
     private List<String> groupPhoto = new ArrayList<>();;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

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

@@ -16,6 +16,4 @@ public class LoanHomeVisitInvestigateSaveZCLDto implements Vo {
     private List<String> houseProperty;
     @ApiModelProperty("车辆")
     private List<String> carProperty;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

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

@@ -28,6 +28,4 @@ public class LoanHomeVisitInvestigateSaveZMWJDto implements Vo {
     private List<String> guarantorIdCard;
     @ApiModelProperty("担保人户口本")
     private List<String> guarantorAccount;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateInitOperVo.java

@@ -18,6 +18,4 @@ public class LoanHomeVisitInvestigateInitOperVo implements Vo {
     private String operationType;
     @ApiModelProperty("运营方式key")
     private String operationKey;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateSaveOperDto.java

@@ -18,6 +18,4 @@ public class LoanHomeVisitInvestigateSaveOperDto implements Vo {
     private String operationType;
     @ApiModelProperty("运营方式key")
     private String operationKey;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateInitOrderVo.java

@@ -28,6 +28,4 @@ public class LoanHomeVisitInvestigateInitOrderVo implements Vo {
     private String paymentRatiokey;
     @ApiModelProperty("金融首付比例备注")
     private String paymentRemarks;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateSaveOrderDto.java

@@ -28,6 +28,4 @@ public class LoanHomeVisitInvestigateSaveOrderDto implements Vo {
     private String paymentRatiokey;
     @ApiModelProperty("金融首付比例备注")
     private String paymentRemarks;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateInitPropVo.java

@@ -36,6 +36,4 @@ public class LoanHomeVisitInvestigateInitPropVo implements Vo {
     private String otherIncomeKey;
     @ApiModelProperty("其他收入来源")
     private String otherIncome;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateSavePropDto.java

@@ -36,6 +36,4 @@ public class LoanHomeVisitInvestigateSavePropDto implements Vo {
     private String otherIncomeKey;
     @ApiModelProperty("其他收入来源")
     private String otherIncome;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateInitTranVo.java

@@ -38,6 +38,4 @@ public class LoanHomeVisitInvestigateInitTranVo implements Vo {
     private String income;
     @ApiModelProperty("净收入")
     private String netIncome;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateSaveTranDto.java

@@ -38,6 +38,4 @@ public class LoanHomeVisitInvestigateSaveTranDto implements Vo {
     private String income;
     @ApiModelProperty("净收入")
     private String netIncome;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@@ -124,7 +124,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         LoanHomevisitInvestigateQuery query = pq.getParams();
         QueryWrapper<LoanHomevisitInvestigate> qw = new QueryWrapper<>();
         qw.eq("li.state", query.getType());
-        if ("1".equals(query.getType())){
+        if ("1".equals(query.getType())) {
             qw.eq("bb.busNo", 302);
         }
         if (StringUtils.isNotBlank(query.getMenuSid())) {
@@ -474,7 +474,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomeVisitInvestigateInitCustomerVo.setLenderNam(busSalesOrderBorrowerDetailsVo.getBorrowerName());
             loanHomeVisitInvestigateInitCustomerVo.setIdNumber(crmCustomerTempVo.getIDNumber());
             loanHomeVisitInvestigateInitCustomerVo.setMobile(busSalesOrderBorrowerDetailsVo.getMobile());
-            loanHomeVisitInvestigateInitCustomerVo.setMainSid(sid);
+            loanHomeVisitInvestigateInitCustomerVo.setSid(sid);
             return rb.success().setData(loanHomeVisitInvestigateInitCustomerVo);
         }
         //银行卡附件
@@ -489,15 +489,20 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         //其他人员
         List<LoanHomeVisitInvestigateInitOtherPeoVo> loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid);
         loanHomeVisitInvestigateInitCustomerVo.setOtherPersonnel(loanHomeVisitInvestigateInitOtherPeoVos);
-        loanHomeVisitInvestigateInitCustomerVo.setMainSid(sid);
+        loanHomeVisitInvestigateInitCustomerVo.setSid(sid);
         return rb.success().setData(loanHomeVisitInvestigateInitCustomerVo);
     }
 
     public ResultBean saveHomeVisitCustomerInfo(LoanHomeVisitInvestigateSaveCustomerDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        LoanHomevisitInvestigateCustomerDto loanHomevisitInvestigateCustomerDto = new LoanHomevisitInvestigateCustomerDto();
         List<LoanHomeVisitInvestigateSaveOtherPeoDto> otherPersonnel = dto.getOtherPersonnel();
-        BeanUtil.copyProperties(dto, loanHomevisitInvestigateCustomerDto);
+        LoanHomevisitInvestigateCustomerDto loanHomevisitInvestigateCustomerDto = new LoanHomevisitInvestigateCustomerDto();
+        LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.selByMainSid(dto.getSid());
+        if (loanHomevisitInvestigateCustomerDetailsVo == null) {
+            BeanUtil.copyProperties(dto, loanHomevisitInvestigateCustomerDto, "sid");
+        } else {
+            BeanUtil.copyProperties(loanHomevisitInvestigateCustomerDetailsVo, loanHomevisitInvestigateCustomerDto);
+        }
         loanHomevisitInvestigateCustomerDto.setIsConfirmRealBuyer(dto.getActualBuyer());
         loanHomevisitInvestigateCustomerDto.setBorrowerSid(dto.getLenderSid());
         loanHomevisitInvestigateCustomerDto.setBorrowerName(dto.getLenderNam());
@@ -532,9 +537,9 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         loanHomevisitInvestigateCustomerDto.setEmergencyMobile(dto.getEmergencyContactMobile());
         loanHomevisitInvestigateCustomerDto.setRelationshipKey(dto.getEmergencyContactTypeKey());
         loanHomevisitInvestigateCustomerDto.setRelationshipValue(dto.getEmergencyContactType());
-        loanHomevisitInvestigateCustomerDto.setMainSid(dto.getMainSid());
+        loanHomevisitInvestigateCustomerDto.setMainSid(dto.getSid());
         loanHomevisitInvestigateCustomerService.saveOrUpdateDto(loanHomevisitInvestigateCustomerDto);
-        loanHomevisitInvestigateOtherpeoService.delByMainSid(dto.getMainSid());
+        loanHomevisitInvestigateOtherpeoService.delByMainSid(dto.getSid());
         for (LoanHomeVisitInvestigateSaveOtherPeoDto loanHomeVisitInvestigateSaveOtherPeoDto : otherPersonnel) {
             LoanHomevisitInvestigateOtherpeoDto loanHomevisitInvestigateOtherpeoDto = new LoanHomevisitInvestigateOtherpeoDto();
             BeanUtil.copyProperties(loanHomeVisitInvestigateSaveOtherPeoDto, loanHomevisitInvestigateOtherpeoDto);
@@ -546,7 +551,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomevisitInvestigateOtherpeoDto.setPeoPreAddress(loanHomeVisitInvestigateSaveOtherPeoDto.getAddress());
             loanHomevisitInvestigateOtherpeoDto.setWorkUnit(loanHomeVisitInvestigateSaveOtherPeoDto.getCompany());
             loanHomevisitInvestigateOtherpeoDto.setPeoCareerValue(loanHomeVisitInvestigateSaveOtherPeoDto.getJob());
-            loanHomevisitInvestigateOtherpeoDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateOtherpeoDto.setMainSid(dto.getSid());
             loanHomevisitInvestigateOtherpeoService.saveOrUpdateDto(loanHomevisitInvestigateOtherpeoDto);
         }
         return rb.success();
@@ -557,7 +562,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         LoanHomeVisitInvestigateInitOrderVo loanHomeVisitInvestigateInitOrderVos = loanHomevisitInvestigateOrderService.getHomeVisitOrderInfo(sid);
         if (loanHomeVisitInvestigateInitOrderVos == null) {
             loanHomeVisitInvestigateInitOrderVos = new LoanHomeVisitInvestigateInitOrderVo();
-            loanHomeVisitInvestigateInitOrderVos.setMainSid(sid);
+            loanHomeVisitInvestigateInitOrderVos.setSid(sid);
         }
         return rb.success().setData(loanHomeVisitInvestigateInitOrderVos);
     }
@@ -565,11 +570,17 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
     public ResultBean saveHomeVisitOrderInfo(LoanHomeVisitInvestigateSaveOrderDto dto) {
         ResultBean rb = ResultBean.fireFail();
         LoanHomevisitInvestigateOrderDto loanHomevisitInvestigateOrderDto = new LoanHomevisitInvestigateOrderDto();
-        BeanUtil.copyProperties(dto, loanHomevisitInvestigateOrderDto);
+        LoanHomevisitInvestigateOrderDetailsVo loanHomevisitInvestigateOrderDetailsVo = loanHomevisitInvestigateOrderService.selByMainSid(dto.getSid());
+        if (loanHomevisitInvestigateOrderDetailsVo == null) {
+            BeanUtil.copyProperties(dto, loanHomevisitInvestigateOrderDto, "sid");
+        } else {
+            BeanUtil.copyProperties(loanHomevisitInvestigateOrderDetailsVo, loanHomevisitInvestigateOrderDto);
+        }
         loanHomevisitInvestigateOrderDto.setCarConfirm(dto.getCarInfoKey());
         loanHomevisitInvestigateOrderDto.setCarRemarks(dto.getCarInfoRemarks());
         loanHomevisitInvestigateOrderDto.setFinConfirm(dto.getFinanceKey());
         loanHomevisitInvestigateOrderDto.setFinRemarks(dto.getFinanceRemarks());
+        loanHomevisitInvestigateOrderDto.setMainSid(dto.getSid());
         loanHomevisitInvestigateOrderService.saveOrUpdateDto(loanHomevisitInvestigateOrderDto);
         return rb.success();
     }
@@ -579,7 +590,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         LoanHomeVisitInvestigateInitOperVo loanHomeVisitInvestigateInitOperVo = loanHomevisitInvestigateOperationsService.getHomeVisitOperationInfo(sid);
         if (loanHomeVisitInvestigateInitOperVo == null) {
             loanHomeVisitInvestigateInitOperVo = new LoanHomeVisitInvestigateInitOperVo();
-            loanHomeVisitInvestigateInitOperVo.setMainSid(sid);
+            loanHomeVisitInvestigateInitOperVo.setSid(sid);
         }
         return rb.success().setData(loanHomeVisitInvestigateInitOperVo);
     }
@@ -587,12 +598,18 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
     public ResultBean saveHomeVisitOperationInfo(LoanHomeVisitInvestigateSaveOperDto dto) {
         ResultBean rb = ResultBean.fireFail();
         LoanHomevisitInvestigateOperationsDto loanHomevisitInvestigateOperationsDto = new LoanHomevisitInvestigateOperationsDto();
-        BeanUtil.copyProperties(dto, loanHomevisitInvestigateOperationsDto);
+        LoanHomevisitInvestigateOperationsDetailsVo loanHomevisitInvestigateOperationsDetailsVo = loanHomevisitInvestigateOperationsService.selByMainSid(dto.getSid());
+        if (loanHomevisitInvestigateOperationsDetailsVo == null) {
+            BeanUtil.copyProperties(dto, loanHomevisitInvestigateOperationsDto, "sid");
+        } else {
+            BeanUtil.copyProperties(loanHomevisitInvestigateOperationsDetailsVo, loanHomevisitInvestigateOperationsDto);
+        }
         loanHomevisitInvestigateOperationsDto.setIndustryYears(dto.getNumYears());
         loanHomevisitInvestigateOperationsDto.setDriveProTypeKey(dto.getDriveKey());
         loanHomevisitInvestigateOperationsDto.setDriveProTypeValue(dto.getDriveType());
         loanHomevisitInvestigateOperationsDto.setBeforeOpeTypeKey(dto.getOperationKey());
         loanHomevisitInvestigateOperationsDto.setBeforeOpeTypeValue(dto.getOperationType());
+        loanHomevisitInvestigateOperationsDto.setMainSid(dto.getSid());
         loanHomevisitInvestigateOperationsService.saveOrUpdateDto(loanHomevisitInvestigateOperationsDto);
         return rb.success();
     }
@@ -602,7 +619,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         LoanHomeVisitInvestigateInitTranVo loanHomeVisitInvestigateInitTranVo = loanHomevisitInvestigateTransportService.getHomeVisitTransportInfo(sid);
         if (loanHomeVisitInvestigateInitTranVo == null) {
             loanHomeVisitInvestigateInitTranVo = new LoanHomeVisitInvestigateInitTranVo();
-            loanHomeVisitInvestigateInitTranVo.setMainSid(sid);
+            loanHomeVisitInvestigateInitTranVo.setSid(sid);
         }
         return rb.success().setData(loanHomeVisitInvestigateInitTranVo);
     }
@@ -610,7 +627,12 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
     public ResultBean saveHomeVisitTransportInfo(LoanHomeVisitInvestigateSaveTranDto dto) {
         ResultBean rb = ResultBean.fireFail();
         LoanHomevisitInvestigateTransportDto loanHomevisitInvestigateTransportDto = new LoanHomevisitInvestigateTransportDto();
-        BeanUtil.copyProperties(dto, loanHomevisitInvestigateTransportDto);
+        LoanHomevisitInvestigateTransportDetailsVo loanHomevisitInvestigateTransportDetailsVo = loanHomevisitInvestigateTransportService.selByMainSid(dto.getSid());
+        if (loanHomevisitInvestigateTransportDetailsVo == null) {
+            BeanUtil.copyProperties(dto, loanHomevisitInvestigateTransportDto, "sid");
+        } else {
+            BeanUtil.copyProperties(loanHomevisitInvestigateTransportDetailsVo, loanHomevisitInvestigateTransportDto);
+        }
         loanHomevisitInvestigateTransportDto.setTransportTypeKey(dto.getTransportKey());
         loanHomevisitInvestigateTransportDto.setTransportTypeValue(dto.getTransportType());
         loanHomevisitInvestigateTransportDto.setTransportGoodsTrip(dto.getTransportGoodsGoTo());
@@ -623,6 +645,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         loanHomevisitInvestigateTransportDto.setDriverSalary(dto.getDriverWage());
         loanHomevisitInvestigateTransportDto.setToll(dto.getRoadToll());
         loanHomevisitInvestigateTransportDto.setExpectedRevenue(dto.getIncome());
+        loanHomevisitInvestigateTransportDto.setMainSid(dto.getSid());
         loanHomevisitInvestigateTransportService.saveOrUpdateDto(loanHomevisitInvestigateTransportDto);
         return rb.success();
     }
@@ -632,7 +655,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         LoanHomeVisitInvestigateInitPropVo loanHomeVisitInvestigateInitPropVo = loanHomevisitInvestigatePropertyService.getHomeVisitAssetsInfo(sid);
         if (loanHomeVisitInvestigateInitPropVo == null) {
             loanHomeVisitInvestigateInitPropVo = new LoanHomeVisitInvestigateInitPropVo();
-            loanHomeVisitInvestigateInitPropVo.setMainSid(sid);
+            loanHomeVisitInvestigateInitPropVo.setSid(sid);
         }
         return rb.success().setData(loanHomeVisitInvestigateInitPropVo);
     }
@@ -640,7 +663,12 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
     public ResultBean saveHomeVisitAssetsInfo(LoanHomeVisitInvestigateSavePropDto dto) {
         ResultBean rb = ResultBean.fireFail();
         LoanHomevisitInvestigatePropertyDto loanHomevisitInvestigatePropertyDto = new LoanHomevisitInvestigatePropertyDto();
-        BeanUtil.copyProperties(dto, loanHomevisitInvestigatePropertyDto);
+        LoanHomevisitInvestigatePropertyDetailsVo loanHomevisitInvestigatePropertyDetailsVo = loanHomevisitInvestigatePropertyService.selByMainSid(dto.getSid());
+        if (loanHomevisitInvestigatePropertyDetailsVo == null) {
+            BeanUtil.copyProperties(dto, loanHomevisitInvestigatePropertyDto, "sid");
+        } else {
+            BeanUtil.copyProperties(loanHomevisitInvestigatePropertyDetailsVo, loanHomevisitInvestigatePropertyDto);
+        }
         loanHomevisitInvestigatePropertyDto.setIsRealEstate(dto.getHouseCheck());
         if (dto.getHouseCheck()) {
             loanHomevisitInvestigatePropertyDto.setPropertyType(dto.getHouseState());
@@ -668,6 +696,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         loanHomevisitInvestigatePropertyDto.setDownPaySourceValue(dto.getDownPayment());
         loanHomevisitInvestigatePropertyDto.setOtherSourceKey(dto.getOtherIncomeKey());
         loanHomevisitInvestigatePropertyDto.setOtherSourceValue(dto.getOtherIncome());
+        loanHomevisitInvestigatePropertyDto.setMainSid(dto.getSid());
         loanHomevisitInvestigatePropertyService.saveOrUpdateDto(loanHomevisitInvestigatePropertyDto);
         return rb.success();
     }
@@ -720,16 +749,17 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             }
         }
         loanHomeVisitInvestigateInitJFJZVo.setGroupPhoto(groupPhoto);
-        loanHomeVisitInvestigateInitJFJZVo.setMainSid(sid);
+        loanHomeVisitInvestigateInitJFJZVo.setSid(sid);
         return rb.success().setData(loanHomeVisitInvestigateInitJFJZVo);
     }
 
     public ResultBean saveHomeVisitWitnessInfo(LoanHomeVisitInvestigateSaveJFJZDto dto) {
         ResultBean rb = ResultBean.fireFail();
         //定位信息
+        loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.DWXX.getAttachType());
         for (String dwxx : dto.getLocation()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DWXX.getAttachType());
             if (dwxx.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                 dwxx = dwxx.replace(fileUploadComponent.getUrlPrefix(), "");
@@ -738,9 +768,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
         }
         //房屋照片
+        loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.FWZP.getAttachType());
         for (String fwzp : dto.getHouse()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.FWZP.getAttachType());
             if (fwzp.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                 fwzp = fwzp.replace(fileUploadComponent.getUrlPrefix(), "");
@@ -749,9 +780,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
         }
         //门口照片
+        loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.MKZP.getAttachType());
         for (String mkzp : dto.getDoorway()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.MKZP.getAttachType());
             if (mkzp.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                 mkzp = mkzp.replace(fileUploadComponent.getUrlPrefix(), "");
@@ -760,9 +792,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
         }
         //客厅卧室
+        loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.KTWSZP.getAttachType());
         for (String ktwszp : dto.getIndoor()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.KTWSZP.getAttachType());
             if (ktwszp.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                 ktwszp = ktwszp.replace(fileUploadComponent.getUrlPrefix(), "");
@@ -771,9 +804,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
         }
         //合影照等
+        loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.HYZD.getAttachType());
         for (String hyzd : dto.getGroupPhoto()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.HYZD.getAttachType());
             if (hyzd.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                 hyzd = hyzd.replace(fileUploadComponent.getUrlPrefix(), "");
@@ -868,16 +902,17 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             }
         }
         loanHomeVisitInvestigateInitZMWJVo.setGuarantorAccount(guarantorAccount);
-        loanHomeVisitInvestigateInitZMWJVo.setMainSid(sid);
+        loanHomeVisitInvestigateInitZMWJVo.setSid(sid);
         return rb.success().setData(loanHomeVisitInvestigateInitZMWJVo);
     }
 
     public ResultBean saveHomeVisitProveFileInfo(LoanHomeVisitInvestigateSaveZMWJDto dto) {
         ResultBean rb = ResultBean.fireFail();
         //贷款人身份证
+        loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.DKRSFZ.getAttachType());
         for (String dkrsfz : dto.getLenderIdCard()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRSFZ.getAttachType());
             if (dkrsfz.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                 dkrsfz = dkrsfz.replace(fileUploadComponent.getUrlPrefix(), "");
@@ -886,9 +921,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
         }
         //贷款人户口本
+        loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.DKRHKB.getAttachType());
         for (String dkrhkb : dto.getLenderAccount()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRHKB.getAttachType());
             if (dkrhkb.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                 dkrhkb = dkrhkb.replace(fileUploadComponent.getUrlPrefix(), "");
@@ -897,9 +933,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
         }
         //贷款人婚姻证明
+        loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.DKRHYZM.getAttachType());
         for (String dkrhyzm : dto.getLenderMarriageCertificate()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRHYZM.getAttachType());
             if (dkrhyzm.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                 dkrhyzm = dkrhyzm.replace(fileUploadComponent.getUrlPrefix(), "");
@@ -908,9 +945,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
         }
         //贷款人驾驶本
+        loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.DKRJSB.getAttachType());
         for (String dkrjsb : dto.getLenderDriverBook()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRJSB.getAttachType());
             if (dkrjsb.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                 dkrjsb = dkrjsb.replace(fileUploadComponent.getUrlPrefix(), "");
@@ -919,9 +957,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
         }
         //贷款人银行流水
+        loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.DKRYHLS.getAttachType());
         for (String dkryhls : dto.getLenderBankStatement()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRYHLS.getAttachType());
             if (dkryhls.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                 dkryhls = dkryhls.replace(fileUploadComponent.getUrlPrefix(), "");
@@ -930,9 +969,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
         }
         //配偶身份证
+        loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.POSFZ.getAttachType());
         for (String posfz : dto.getSpouseIdCard()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.POSFZ.getAttachType());
             if (posfz.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                 posfz = posfz.replace(fileUploadComponent.getUrlPrefix(), "");
@@ -941,9 +981,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
         }
         //配偶户口本
+        loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.POHKB.getAttachType());
         for (String pohkb : dto.getSpouseAccount()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.POHKB.getAttachType());
             if (pohkb.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                 pohkb = pohkb.replace(fileUploadComponent.getUrlPrefix(), "");
@@ -952,9 +993,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
         }
         //担保人身份证
+        loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.DBRSFZ.getAttachType());
         for (String dbrsfz : dto.getGuarantorIdCard()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRSFZ.getAttachType());
             if (dbrsfz.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                 dbrsfz = dbrsfz.replace(fileUploadComponent.getUrlPrefix(), "");
@@ -963,9 +1005,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
         }
         //担保人户口本
+        loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.DBRHKB.getAttachType());
         for (String dbrhkb : dto.getGuarantorAccount()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRHKB.getAttachType());
             if (dbrhkb.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                 dbrhkb = dbrhkb.replace(fileUploadComponent.getUrlPrefix(), "");
@@ -1006,16 +1049,17 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             }
         }
         loanHomeVisitInvestigateInitZCLVo.setCarProperty(carProperty);
-        loanHomeVisitInvestigateInitZCLVo.setMainSid(sid);
+        loanHomeVisitInvestigateInitZCLVo.setSid(sid);
         return rb.success().setData(loanHomeVisitInvestigateInitZCLVo);
     }
 
     public ResultBean saveAssetCertificateInfo(LoanHomeVisitInvestigateSaveZCLDto dto) {
         ResultBean rb = ResultBean.fireFail();
         //银行卡
+        loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.YHK.getAttachType());
         for (String yhk : dto.getYhkImages()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType());
             if (yhk.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                 yhk = yhk.replace(fileUploadComponent.getUrlPrefix(), "");
@@ -1024,9 +1068,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
         }
         //房产
+        loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.FC.getAttachType());
         for (String fc : dto.getHouseProperty()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.FC.getAttachType());
             if (fc.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                 fc = fc.replace(fileUploadComponent.getUrlPrefix(), "");
@@ -1035,9 +1080,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
         }
         //车辆
+        loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.CL.getAttachType());
         for (String cl : dto.getCarProperty()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateFileDto.setMainSid(dto.getSid());
             loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.CL.getAttachType());
             if (cl.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                 cl = cl.replace(fileUploadComponent.getUrlPrefix(), "");
@@ -1051,7 +1097,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
     public ResultBean saveReportInfo(String comment, Boolean agree, String sid) {
         ResultBean rb = ResultBean.fireFail();
         String jg = "不通过";
-        if (agree){
+        if (agree) {
             jg = "通过";
         }
         baseMapper.saveReportInfo(comment, jg, sid);
@@ -1070,9 +1116,9 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         userInfo.add(financeForm1);
         LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.selByMainSid(sid);
         FinanceForm financeForm2 = new FinanceForm();
-        if (loanHomevisitInvestigateCustomerDetailsVo.getIsConfirmRealBuyer()){
+        if (loanHomevisitInvestigateCustomerDetailsVo.getIsConfirmRealBuyer()) {
             financeForm2.setValue("借款人姓名：" + loanHomevisitInvestigateCustomerDetailsVo.getBorrowerName() + "(实际购车人)");
-        }else {
+        } else {
             financeForm2.setValue("借款人姓名：" + loanHomevisitInvestigateCustomerDetailsVo.getBorrowerName() + "(不是实际购车人)");
         }
         financeForm2.setSpanSize(2);
@@ -1115,14 +1161,14 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         financeForm12.setType(3);
         List<String> yhkImages = new ArrayList<>();
         List<LoanHomevisitInvestigateFileDetailsVo> loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType());
-        if (loanHomevisitInvestigateFileDetailsVos != null &&  loanHomevisitInvestigateFileDetailsVos.size() > 0){
+        if (loanHomevisitInvestigateFileDetailsVos != null && loanHomevisitInvestigateFileDetailsVos.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : loanHomevisitInvestigateFileDetailsVos) {
                 yhkImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
             }
         }
         financeForm12.setFiles(yhkImages);
         userInfo.add(financeForm12);
-        if ("0004".equals(loanHomevisitInvestigateCustomerDetailsVo.getMaritalStatusKey())){
+        if ("0004".equals(loanHomevisitInvestigateCustomerDetailsVo.getMaritalStatusKey())) {
             FinanceForm financeForm13 = new FinanceForm();
             financeForm13.setValue("配偶");
             financeForm13.setSpanSize(2);
@@ -1153,7 +1199,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             userInfo.add(financeForm19);
         }
         List<LoanHomeVisitInvestigateInitOtherPeoVo> loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid);
-        if (loanHomeVisitInvestigateInitOtherPeoVos != null && loanHomeVisitInvestigateInitOtherPeoVos.size() > 0){
+        if (loanHomeVisitInvestigateInitOtherPeoVos != null && loanHomeVisitInvestigateInitOtherPeoVos.size() > 0) {
             FinanceForm financeForm20 = new FinanceForm();
             financeForm20.setValue("其他人员");
             financeForm20.setSpanSize(2);
@@ -1272,7 +1318,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         transInfo.add(financeForm42);
         LoanHomevisitInvestigatePropertyDetailsVo loanHomevisitInvestigatePropertyDetailsVo = loanHomevisitInvestigatePropertyService.selByMainSid(sid);
         List<FinanceForm> zCInfo = new ArrayList<>();
-        if (loanHomevisitInvestigatePropertyDetailsVo.getIsRealEstate()){
+        if (loanHomevisitInvestigatePropertyDetailsVo.getIsRealEstate()) {
             FinanceForm financeForm43 = new FinanceForm();
             financeForm43.setValue("房产");
             financeForm43.setSpanSize(2);
@@ -1281,11 +1327,11 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             zCInfo.add(financeForm43);
             FinanceForm financeForm44 = new FinanceForm();
             String propertyType = "";
-            if (loanHomevisitInvestigatePropertyDetailsVo.getPropertyType() == 1){
+            if (loanHomevisitInvestigatePropertyDetailsVo.getPropertyType() == 1) {
                 propertyType = "商品房";
-            }else if (loanHomevisitInvestigatePropertyDetailsVo.getPropertyType() == 2){
+            } else if (loanHomevisitInvestigatePropertyDetailsVo.getPropertyType() == 2) {
                 propertyType = "商铺";
-            }else if (loanHomevisitInvestigatePropertyDetailsVo.getPropertyType() == 3){
+            } else if (loanHomevisitInvestigatePropertyDetailsVo.getPropertyType() == 3) {
                 propertyType = "集体";
             }
             financeForm44.setValue("产权类型：" + propertyType);
@@ -1298,12 +1344,12 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             financeForm46.setSpanSize(2);
             zCInfo.add(financeForm46);
         }
-        if (loanHomevisitInvestigatePropertyDetailsVo.getIsCar()){
+        if (loanHomevisitInvestigatePropertyDetailsVo.getIsCar()) {
             FinanceForm financeForm47 = new FinanceForm();
             String carType = "";
-            if (loanHomevisitInvestigatePropertyDetailsVo.getCarType() == 1){
+            if (loanHomevisitInvestigatePropertyDetailsVo.getCarType() == 1) {
                 carType = "商用车";
-            }else if (loanHomevisitInvestigatePropertyDetailsVo.getCarType() == 2){
+            } else if (loanHomevisitInvestigatePropertyDetailsVo.getCarType() == 2) {
                 carType = "轿车";
             }
             financeForm47.setValue("车辆类型：" + carType);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileMapper.java

@@ -69,4 +69,7 @@ public interface LoanHomevisitInvestigateFileMapper extends BaseMapper<LoanHomev
 
     @Delete("delete from loan_homevisit_investigate_file where mainSid = #{dtoSid}")
     void delByMainSid(String dtoSid);
+
+    @Delete("delete from loan_homevisit_investigate_file where mainSid = #{dtoSid} and attachType =#{type}")
+    void delByMainSidAndType(@Param("dtoSid") String dtoSid,@Param("type") String type);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileService.java

@@ -58,254 +58,258 @@ import java.util.List;
 @Service
 public class LoanHomevisitInvestigateFileService extends MybatisBaseService<LoanHomevisitInvestigateFileMapper, LoanHomevisitInvestigateFile> {
 
-	@Autowired
-	private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
 
-	private QueryWrapper<LoanHomevisitInvestigateFile> createQueryWrapper(LoanHomevisitInvestigateFileQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<LoanHomevisitInvestigateFile> qw = new QueryWrapper<>();
-		return qw;
-	}
-	
-	public PagerVo<LoanHomevisitInvestigateFileVo> listPageVo(PagerQuery<LoanHomevisitInvestigateFileQuery> pq) {
-		LoanHomevisitInvestigateFileQuery query = pq.getParams();
-		QueryWrapper<LoanHomevisitInvestigateFile> qw = createQueryWrapper(query);
-		IPage<LoanHomevisitInvestigateFile> page = PagerUtil.queryToPage(pq);
-		IPage<LoanHomevisitInvestigateFileVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<LoanHomevisitInvestigateFileVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
-	public void saveOrUpdateDto(LoanHomevisitInvestigateFileDto dto){
+    private QueryWrapper<LoanHomevisitInvestigateFile> createQueryWrapper(LoanHomevisitInvestigateFileQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<LoanHomevisitInvestigateFile> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public PagerVo<LoanHomevisitInvestigateFileVo> listPageVo(PagerQuery<LoanHomevisitInvestigateFileQuery> pq) {
+        LoanHomevisitInvestigateFileQuery query = pq.getParams();
+        QueryWrapper<LoanHomevisitInvestigateFile> qw = createQueryWrapper(query);
+        IPage<LoanHomevisitInvestigateFile> page = PagerUtil.queryToPage(pq);
+        IPage<LoanHomevisitInvestigateFileVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<LoanHomevisitInvestigateFileVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void saveOrUpdateDto(LoanHomevisitInvestigateFileDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             this.insertByDto(dto);
-            return; 
-        } 
-		this.updateByDto(dto);
-	}
-	
-	public void insertByDto(LoanHomevisitInvestigateFileDto dto){
-		LoanHomevisitInvestigateFile entity = new LoanHomevisitInvestigateFile();
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.insert(entity);
-	}
-	
-	public void updateByDto(LoanHomevisitInvestigateFileDto dto){
-          String dtoSid = dto.getSid();
+            return;
+        }
+        this.updateByDto(dto);
+    }
+
+    public void insertByDto(LoanHomevisitInvestigateFileDto dto) {
+        LoanHomevisitInvestigateFile entity = new LoanHomevisitInvestigateFile();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(LoanHomevisitInvestigateFileDto dto) {
+        String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
-        } 
-		LoanHomevisitInvestigateFile entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-	}
-	
-	public LoanHomevisitInvestigateFileDetailsVo fetchDetailsVoBySid(String sid){
-		LoanHomevisitInvestigateFile entity = fetchBySid(sid);
-		LoanHomevisitInvestigateFileDetailsVo vo = new LoanHomevisitInvestigateFileDetailsVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
+        }
+        LoanHomevisitInvestigateFile entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public LoanHomevisitInvestigateFileDetailsVo fetchDetailsVoBySid(String sid) {
+        LoanHomevisitInvestigateFile entity = fetchBySid(sid);
+        LoanHomevisitInvestigateFileDetailsVo vo = new LoanHomevisitInvestigateFileDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public ResultBean saveOrUpdateAllDto(LoanHomevisitInvestigateFileAllDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        //定位信息
+        for (String dwxxImage : dto.getDwxxImages()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            if (dwxxImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                dwxxImage = dwxxImage.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(dwxxImage);
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DWXX.getAttachType());
+            saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //房屋照片
+        for (String fwzpImage : dto.getFwzpImages()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            if (fwzpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                fwzpImage = fwzpImage.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(fwzpImage);
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.FWZP.getAttachType());
+            saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //门口照片
+        for (String mkzpImage : dto.getMkzpImages()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            if (mkzpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                mkzpImage = mkzpImage.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(mkzpImage);
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.MKZP.getAttachType());
+            saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //客厅卧室照片
+        for (String ktwszpImage : dto.getKtwszpImages()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            if (ktwszpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                ktwszpImage = ktwszpImage.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(ktwszpImage);
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.KTWSZP.getAttachType());
+            saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //合影照等
+        for (String hyzdImage : dto.getHyzdImages()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            if (hyzdImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                hyzdImage = hyzdImage.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(hyzdImage);
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.HYZD.getAttachType());
+            saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //贷款人身份证
+        for (String dkrsfzImage : dto.getDkrsfzImages()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            if (dkrsfzImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                dkrsfzImage = dkrsfzImage.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(dkrsfzImage);
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRSFZ.getAttachType());
+            saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //贷款人户口本
+        for (String dkrhkbImage : dto.getDkrhkbImages()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            if (dkrhkbImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                dkrhkbImage = dkrhkbImage.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(dkrhkbImage);
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRHKB.getAttachType());
+            saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //贷款人婚姻证明
+        for (String dkrhyzmImage : dto.getDkrhyzmImages()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            if (dkrhyzmImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                dkrhyzmImage = dkrhyzmImage.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(dkrhyzmImage);
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRHYZM.getAttachType());
+            saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //贷款人驾驶本
+        for (String dkrjsbImage : dto.getDkrjsbImages()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            if (dkrjsbImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                dkrjsbImage = dkrjsbImage.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(dkrjsbImage);
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRJSB.getAttachType());
+            saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //贷款人银行流水
+        for (String dkryhlsImage : dto.getDkryhlsImages()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            if (dkryhlsImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                dkryhlsImage = dkryhlsImage.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(dkryhlsImage);
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRYHLS.getAttachType());
+            saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //配偶身份证
+        for (String posfzImage : dto.getPosfzImages()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            if (posfzImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                posfzImage = posfzImage.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(posfzImage);
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.POSFZ.getAttachType());
+            saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //配偶户口本
+        for (String pohkbImage : dto.getPohkbImages()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            if (pohkbImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                pohkbImage = pohkbImage.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(pohkbImage);
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.POHKB.getAttachType());
+            saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //担保人身份证
+        for (String dbrsfzImage : dto.getDbrsfzImages()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            if (dbrsfzImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                dbrsfzImage = dbrsfzImage.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(dbrsfzImage);
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRSFZ.getAttachType());
+            saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //担保人户口本
+        for (String dbrhkbImage : dto.getDbrhkbImages()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            if (dbrhkbImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                dbrhkbImage = dbrhkbImage.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(dbrhkbImage);
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRHKB.getAttachType());
+            saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //银行卡
+        for (String yhkImage : dto.getYhkImages()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            if (yhkImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                yhkImage = yhkImage.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(yhkImage);
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType());
+            saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //房产
+        for (String fcImage : dto.getFcImages()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            if (fcImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                fcImage = fcImage.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(fcImage);
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.FC.getAttachType());
+            saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        //车辆
+        for (String clImage : dto.getClImages()) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            if (clImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                clImage = clImage.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(clImage);
+            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.CL.getAttachType());
+            saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        return rb.success();
+    }
 
-	public ResultBean saveOrUpdateAllDto(LoanHomevisitInvestigateFileAllDto dto) {
-		ResultBean rb = ResultBean.fireFail();
-		//定位信息
-		for (String dwxxImage : dto.getDwxxImages()) {
-			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-			if (dwxxImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-				dwxxImage = dwxxImage.replace(fileUploadComponent.getUrlPrefix(), "");
-			}
-			loanHomevisitInvestigateFileDto.setFileUrl(dwxxImage);
-			loanHomevisitInvestigateFileDto.setSid(dto.getSid());
-			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DWXX.getAttachType());
-			saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-		}
-		//房屋照片
-		for (String fwzpImage : dto.getFwzpImages()) {
-			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-			if (fwzpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-				fwzpImage = fwzpImage.replace(fileUploadComponent.getUrlPrefix(), "");
-			}
-			loanHomevisitInvestigateFileDto.setFileUrl(fwzpImage);
-			loanHomevisitInvestigateFileDto.setSid(dto.getSid());
-			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.FWZP.getAttachType());
-			saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-		}
-		//门口照片
-		for (String mkzpImage : dto.getMkzpImages()) {
-			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-			if (mkzpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-				mkzpImage = mkzpImage.replace(fileUploadComponent.getUrlPrefix(), "");
-			}
-			loanHomevisitInvestigateFileDto.setFileUrl(mkzpImage);
-			loanHomevisitInvestigateFileDto.setSid(dto.getSid());
-			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.MKZP.getAttachType());
-			saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-		}
-		//客厅卧室照片
-		for (String ktwszpImage : dto.getKtwszpImages()) {
-			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-			if (ktwszpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-				ktwszpImage = ktwszpImage.replace(fileUploadComponent.getUrlPrefix(), "");
-			}
-			loanHomevisitInvestigateFileDto.setFileUrl(ktwszpImage);
-			loanHomevisitInvestigateFileDto.setSid(dto.getSid());
-			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.KTWSZP.getAttachType());
-			saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-		}
-		//合影照等
-		for (String hyzdImage : dto.getHyzdImages()) {
-			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-			if (hyzdImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-				hyzdImage = hyzdImage.replace(fileUploadComponent.getUrlPrefix(), "");
-			}
-			loanHomevisitInvestigateFileDto.setFileUrl(hyzdImage);
-			loanHomevisitInvestigateFileDto.setSid(dto.getSid());
-			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.HYZD.getAttachType());
-			saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-		}
-		//贷款人身份证
-		for (String dkrsfzImage : dto.getDkrsfzImages()) {
-			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-			if (dkrsfzImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-				dkrsfzImage = dkrsfzImage.replace(fileUploadComponent.getUrlPrefix(), "");
-			}
-			loanHomevisitInvestigateFileDto.setFileUrl(dkrsfzImage);
-			loanHomevisitInvestigateFileDto.setSid(dto.getSid());
-			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRSFZ.getAttachType());
-			saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-		}
-		//贷款人户口本
-		for (String dkrhkbImage : dto.getDkrhkbImages()) {
-			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-			if (dkrhkbImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-				dkrhkbImage = dkrhkbImage.replace(fileUploadComponent.getUrlPrefix(), "");
-			}
-			loanHomevisitInvestigateFileDto.setFileUrl(dkrhkbImage);
-			loanHomevisitInvestigateFileDto.setSid(dto.getSid());
-			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRHKB.getAttachType());
-			saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-		}
-		//贷款人婚姻证明
-		for (String dkrhyzmImage : dto.getDkrhyzmImages()) {
-			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-			if (dkrhyzmImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-				dkrhyzmImage = dkrhyzmImage.replace(fileUploadComponent.getUrlPrefix(), "");
-			}
-			loanHomevisitInvestigateFileDto.setFileUrl(dkrhyzmImage);
-			loanHomevisitInvestigateFileDto.setSid(dto.getSid());
-			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRHYZM.getAttachType());
-			saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-		}
-		//贷款人驾驶本
-		for (String dkrjsbImage : dto.getDkrjsbImages()) {
-			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-			if (dkrjsbImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-				dkrjsbImage = dkrjsbImage.replace(fileUploadComponent.getUrlPrefix(), "");
-			}
-			loanHomevisitInvestigateFileDto.setFileUrl(dkrjsbImage);
-			loanHomevisitInvestigateFileDto.setSid(dto.getSid());
-			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRJSB.getAttachType());
-			saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-		}
-		//贷款人银行流水
-		for (String dkryhlsImage : dto.getDkryhlsImages()) {
-			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-			if (dkryhlsImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-				dkryhlsImage = dkryhlsImage.replace(fileUploadComponent.getUrlPrefix(), "");
-			}
-			loanHomevisitInvestigateFileDto.setFileUrl(dkryhlsImage);
-			loanHomevisitInvestigateFileDto.setSid(dto.getSid());
-			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRYHLS.getAttachType());
-			saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-		}
-		//配偶身份证
-		for (String posfzImage : dto.getPosfzImages()) {
-			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-			if (posfzImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-				posfzImage = posfzImage.replace(fileUploadComponent.getUrlPrefix(), "");
-			}
-			loanHomevisitInvestigateFileDto.setFileUrl(posfzImage);
-			loanHomevisitInvestigateFileDto.setSid(dto.getSid());
-			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.POSFZ.getAttachType());
-			saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-		}
-		//配偶户口本
-		for (String pohkbImage : dto.getPohkbImages()) {
-			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-			if (pohkbImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-				pohkbImage = pohkbImage.replace(fileUploadComponent.getUrlPrefix(), "");
-			}
-			loanHomevisitInvestigateFileDto.setFileUrl(pohkbImage);
-			loanHomevisitInvestigateFileDto.setSid(dto.getSid());
-			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.POHKB.getAttachType());
-			saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-		}
-		//担保人身份证
-		for (String dbrsfzImage : dto.getDbrsfzImages()) {
-			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-			if (dbrsfzImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-				dbrsfzImage = dbrsfzImage.replace(fileUploadComponent.getUrlPrefix(), "");
-			}
-			loanHomevisitInvestigateFileDto.setFileUrl(dbrsfzImage);
-			loanHomevisitInvestigateFileDto.setSid(dto.getSid());
-			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRSFZ.getAttachType());
-			saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-		}
-		//担保人户口本
-		for (String dbrhkbImage : dto.getDbrhkbImages()) {
-			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-			if (dbrhkbImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-				dbrhkbImage = dbrhkbImage.replace(fileUploadComponent.getUrlPrefix(), "");
-			}
-			loanHomevisitInvestigateFileDto.setFileUrl(dbrhkbImage);
-			loanHomevisitInvestigateFileDto.setSid(dto.getSid());
-			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRHKB.getAttachType());
-			saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-		}
-		//银行卡
-		for (String yhkImage : dto.getYhkImages()) {
-			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-			if (yhkImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-				yhkImage = yhkImage.replace(fileUploadComponent.getUrlPrefix(), "");
-			}
-			loanHomevisitInvestigateFileDto.setFileUrl(yhkImage);
-			loanHomevisitInvestigateFileDto.setSid(dto.getSid());
-			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType());
-			saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-		}
-		//房产
-		for (String fcImage : dto.getFcImages()) {
-			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-			if (fcImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-				fcImage = fcImage.replace(fileUploadComponent.getUrlPrefix(), "");
-			}
-			loanHomevisitInvestigateFileDto.setFileUrl(fcImage);
-			loanHomevisitInvestigateFileDto.setSid(dto.getSid());
-			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.FC.getAttachType());
-			saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-		}
-		//车辆
-		for (String clImage : dto.getClImages()) {
-			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-			if (clImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-				clImage = clImage.replace(fileUploadComponent.getUrlPrefix(), "");
-			}
-			loanHomevisitInvestigateFileDto.setFileUrl(clImage);
-			loanHomevisitInvestigateFileDto.setSid(dto.getSid());
-			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.CL.getAttachType());
-			saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-		}
-		return rb.success();
-	}
+    public List<LoanHomevisitInvestigateFileDetailsVo> selByMainSidAndTypeKey(String sid, String attachType) {
+        return baseMapper.selByMainSidAndTypeKey(sid, attachType, fileUploadComponent.getUrlPrefix());
+    }
 
-	public List<LoanHomevisitInvestigateFileDetailsVo> selByMainSidAndTypeKey(String sid, String attachType) {
-		return baseMapper.selByMainSidAndTypeKey(sid,attachType,fileUploadComponent.getUrlPrefix());
-	}
+    public void delByMainSid(String dtoSid) {
+        baseMapper.delByMainSid(dtoSid);
+    }
 
-	public void delByMainSid(String dtoSid) {
-		baseMapper.delByMainSid(dtoSid);
-	}
+    public void delByMainSidAndType(String dtoSid, String type) {
+        baseMapper.delByMainSidAndType(dtoSid, type);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java

@@ -57,6 +57,8 @@ public class AdvanceInvoiceDto implements Dto {
     private List<String> fjApplicationAppendxs;
     @ApiModelProperty("证件")
     private List<String> idCardImages;
+    @ApiModelProperty("车辆买卖合同")
+    private List<String> carBuyContractImages;
     @ApiModelProperty("客户开票申请书")
     private List<String> customerInvoiceApplyImages;
     @ApiModelProperty("车辆登记合同")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java

@@ -62,6 +62,8 @@ public class AdvanceInvoiceInfoVo implements Vo {
     private List<String> fjApplicationAppendxs;
     @ApiModelProperty("证件")
     private List<String> idCardImages;
+    @ApiModelProperty("车辆买卖合同")
+    private List<String> carBuyContractImages;
     @ApiModelProperty("客户开票申请书")
     private List<String> customerInvoiceApplyImages;
     @ApiModelProperty("车辆登记合同")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java

@@ -51,6 +51,8 @@ public class BillApplicationIInfoDto implements Dto {
     private List<FinBillTrailerDto> finBillTrailers; // 开票挂车信息
     @ApiModelProperty("证件")
     private List<String> idCardImages;
+    @ApiModelProperty("车辆买卖合同")
+    private List<String> carBuyContractImages;
     @ApiModelProperty("客户开票申请书")
     private List<String> customerInvoiceApplyImages;
     @ApiModelProperty("车辆登记合同")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java

@@ -51,6 +51,8 @@ public class BillApplicationIInfoVo implements Vo {
     private List<FinBillTrailerVo> finBillTrailers; // 开票挂车信息
     @ApiModelProperty("证件")
     private List<String> idCardImages;
+    @ApiModelProperty("车辆买卖合同")
+    private List<String> carBuyContractImages;
     @ApiModelProperty("客户开票申请书")
     private List<String> customerInvoiceApplyImages;
     @ApiModelProperty("车辆登记合同")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/flowable/InvoicedDto.java

@@ -38,6 +38,8 @@ public class InvoicedDto implements Dto {
 
     @ApiModelProperty("证件")
     private List<String> idCardImages;
+    @ApiModelProperty("车辆买卖合同")
+    private List<String> carBuyContractImages;
     @ApiModelProperty("客户开票申请书")
     private List<String> customerInvoiceApplyImages;
     @ApiModelProperty("车辆登记合同")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitCustomerVo.java

@@ -66,6 +66,4 @@ public class AppLoanHomeVisitInvestigateInitCustomerVo implements Vo {
     private String emergencyContactType;
     @ApiModelProperty("紧急联系人类型key")
     private String emergencyContactTypeKey;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitJFJZVo.java

@@ -20,6 +20,4 @@ public class AppLoanHomeVisitInvestigateInitJFJZVo implements Vo {
     private List<String> indoor;
     @ApiModelProperty("合影照等")
     private List<String> groupPhoto;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOperVo.java

@@ -18,6 +18,4 @@ public class AppLoanHomeVisitInvestigateInitOperVo implements Vo {
     private String operationType;
     @ApiModelProperty("运营方式key")
     private String operationKey;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherPeoVo.java

@@ -26,6 +26,4 @@ public class AppLoanHomeVisitInvestigateInitOtherPeoVo implements Vo {
     private String company;
     @ApiModelProperty("职业")
     private String job;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitPropVo.java

@@ -36,6 +36,4 @@ public class AppLoanHomeVisitInvestigateInitPropVo implements Vo {
     private String otherIncomeKey;
     @ApiModelProperty("其他收入来源")
     private String otherIncome;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitReportStateVo.java

@@ -17,6 +17,4 @@ public class AppLoanHomeVisitInvestigateInitReportStateVo implements Vo {
     private String transportState;
     @ApiModelProperty("资产情况")
     private String assetsState;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitTranVo.java

@@ -38,6 +38,4 @@ public class AppLoanHomeVisitInvestigateInitTranVo implements Vo {
     private String income;
     @ApiModelProperty("净收入")
     private String netIncome;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZCLVo.java

@@ -16,6 +16,4 @@ public class AppLoanHomeVisitInvestigateInitZCLVo implements Vo {
     private List<String> houseProperty;
     @ApiModelProperty("车辆")
     private List<String> carProperty;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZMWJVo.java

@@ -28,6 +28,4 @@ public class AppLoanHomeVisitInvestigateInitZMWJVo implements Vo {
     private List<String> guarantorIdCard;
     @ApiModelProperty("担保人户口本")
     private List<String> guarantorAccount;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveCustomerDto.java

@@ -67,6 +67,4 @@ public class AppLoanHomeVisitInvestigateSaveCustomerDto implements Dto {
     private String emergencyContactType;
     @ApiModelProperty("紧急联系人类型key")
     private String emergencyContactTypeKey;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveJFJZDto.java

@@ -20,6 +20,4 @@ public class AppLoanHomeVisitInvestigateSaveJFJZDto implements Vo {
     private List<String> indoor;
     @ApiModelProperty("合影照等")
     private List<String> groupPhoto;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOperDto.java

@@ -18,6 +18,4 @@ public class AppLoanHomeVisitInvestigateSaveOperDto implements Vo {
     private String operationType;
     @ApiModelProperty("运营方式key")
     private String operationKey;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOrderDto.java

@@ -28,6 +28,4 @@ public class AppLoanHomeVisitInvestigateSaveOrderDto implements Vo {
     private String paymentRatiokey;
     @ApiModelProperty("金融首付比例备注")
     private String paymentRemarks;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSavePropDto.java

@@ -36,6 +36,4 @@ public class AppLoanHomeVisitInvestigateSavePropDto implements Vo {
     private String otherIncomeKey;
     @ApiModelProperty("其他收入来源")
     private String otherIncome;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveTranDto.java

@@ -38,6 +38,4 @@ public class AppLoanHomeVisitInvestigateSaveTranDto implements Vo {
     private String income;
     @ApiModelProperty("净收入")
     private String netIncome;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZCLDto.java

@@ -16,6 +16,4 @@ public class AppLoanHomeVisitInvestigateSaveZCLDto implements Vo {
     private List<String> houseProperty;
     @ApiModelProperty("车辆")
     private List<String> carProperty;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZMWJDto.java

@@ -28,6 +28,4 @@ public class AppLoanHomeVisitInvestigateSaveZMWJDto implements Vo {
     private List<String> guarantorIdCard;
     @ApiModelProperty("担保人户口本")
     private List<String> guarantorAccount;
-    @ApiModelProperty("家访考察表sid")
-    private String mainSid;
 }

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

@@ -76,9 +76,9 @@ public class InvoicedService {
             billApplicationPageVo.setSid(record.getSid());
             billApplicationPageVo.setBillState(record.getBillStateValue());
             billApplicationPageVo.setNodeState(record.getNodeState());
-            if (record.getNodeState().equals("待提交")){
+            if (record.getNodeState().equals("待提交")) {
                 billApplicationPageVo.setShowUpData(true);
-            }else {
+            } else {
                 billApplicationPageVo.setShowUpData(false);
             }
             billApplicationPageVo.setVinNo(record.getVinNo());
@@ -140,10 +140,10 @@ public class InvoicedService {
         //挂车信息
         List<com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo> finBillTrailers = finBillApplicationDetailsVo.getFinBillTrailers();
         List<FinBillTrailerVo> finBillTrailerVos = new ArrayList<>();
-        if (finBillTrailers != null && finBillTrailers.size() > 0){
+        if (finBillTrailers != null && finBillTrailers.size() > 0) {
             for (com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo finBillTrailer : finBillTrailers) {
                 FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo();
-                BeanUtil.copyProperties(finBillTrailer,finBillTrailerVo);
+                BeanUtil.copyProperties(finBillTrailer, finBillTrailerVo);
                 List<String> hgzImageUrl = finBillTrailer.getHgzImageUrl();
                 finBillTrailerVo.setFiles(hgzImageUrl);
                 finBillTrailerVo.setOneBillMoney(finBillTrailer.getOneBillMoney());
@@ -152,43 +152,51 @@ public class InvoicedService {
         }
         vo.setFinBillTrailers(finBillTrailerVos);
         //附件信息
+        List<FinBillFileVo> carBuyContractImages = finBillApplicationDetailsVo.getCarBuyContractImages();
         List<FinBillFileVo> khkpsqsApplicationAppendxs = finBillApplicationDetailsVo.getKhkpsqsApplicationAppendxs();
         List<FinBillFileVo> kpxxqrsApplicationAppendxs = finBillApplicationDetailsVo.getKpxxqrsApplicationAppendxs();
         List<FinBillFileVo> cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs();
         List<FinBillFileVo> zjApplicationAppendxs = finBillApplicationDetailsVo.getZjApplicationAppendxs();
+        List<String> appCarBuyContractImages = new ArrayList<>();//客户开票申请书
         List<String> customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书
         List<String> invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书
         List<String> registerContractImages = new ArrayList<>();//车辆登记合同
         List<String> idCardImages = new ArrayList<>();
-        if (zjApplicationAppendxs.size() > 0){
+        if (carBuyContractImages.size() > 0) {
+            for (FinBillFileVo carBuyContractImage : carBuyContractImages) {
+                appCarBuyContractImages.add(carBuyContractImage.getFileUrl());
+            }
+        }
+        if (zjApplicationAppendxs.size() > 0) {
             for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) {
                 idCardImages.add(zjApplicationAppendx.getFileUrl());
             }
         }
-        if (khkpsqsApplicationAppendxs.size() > 0){
+        if (khkpsqsApplicationAppendxs.size() > 0) {
             for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) {
                 customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl());
             }
         }
-        if (kpxxqrsApplicationAppendxs.size() > 0){
+        if (kpxxqrsApplicationAppendxs.size() > 0) {
             for (FinBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) {
                 invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl());
             }
         }
-        if (cldjhtApplicationAppendxs.size() > 0){
+        if (cldjhtApplicationAppendxs.size() > 0) {
             for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) {
                 registerContractImages.add(cldjhtApplicationAppendx.getFileUrl());
             }
         }
+        vo.setCarBuyContractImages(appCarBuyContractImages);
         vo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages);
         vo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages);
         vo.setRegisterContractImages(registerContractImages);
         vo.setIdCardImages(idCardImages);
         BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData();
-        if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())){
+        if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
             vo.setIsCanEdit(false);
             vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
-        }else {
+        } else {
             vo.setIsCanEdit(true);
         }
         return rb.success().setData(vo);
@@ -196,7 +204,7 @@ public class InvoicedService {
 
     public ResultBean saveInvoicedApplyInfo(BillApplicationIInfoDto dto) {
         FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto();
-        BeanUtil.copyProperties(dto, finBillApplicationDto);
+        BeanUtil.copyProperties(dto, finBillApplicationDto, "carBuyContractImages");
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
         finBillApplicationDto.setUseOrgSid(useOrgSid);
         finBillApplicationDto.setCreateBySid(dto.getUserSid());
@@ -227,7 +235,7 @@ public class InvoicedService {
         List<VinListDto> vinList = dto.getVinList();
         List<FinBillVehicleDto> finBillVehicleDtos = new ArrayList<>();
         for (VinListDto vinListDto : vinList) {
-            if (StringUtils.isBlank(vinListDto.getInvoiceInfo())){
+            if (StringUtils.isBlank(vinListDto.getInvoiceInfo())) {
                 return new ResultBean().fail().setMsg("开票信息不能为空");
             }
             FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto();
@@ -246,7 +254,7 @@ public class InvoicedService {
         //开票挂车信息
         List<FinBillTrailerDto> finBillTrailers = dto.getFinBillTrailers();
         List<com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto> finBillTrailerDtos = new ArrayList<>();
-        if (finBillTrailers != null && finBillTrailers.size() > 0){
+        if (finBillTrailers != null && finBillTrailers.size() > 0) {
             for (FinBillTrailerDto finBillTrailer : finBillTrailers) {
                 com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto finBillTrailerDto = new com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto();
                 BeanUtil.copyProperties(finBillTrailer, finBillTrailerDto);
@@ -255,42 +263,52 @@ public class InvoicedService {
         }
         finBillApplicationDto.setFinBillTrailers(finBillTrailerDtos);
         //附件信息
+        List<String> appCarBuyContractImages = dto.getCarBuyContractImages();//车辆买卖合同
         List<String> customerInvoiceApplyImages = dto.getCustomerInvoiceApplyImages();//客户开票申请书
         List<String> invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书
         List<String> registerContractImages = dto.getRegisterContractImages();//车辆登记合同
         List<String> idCardImages = dto.getIdCardImages();//证件
+        List<FinBillFileDto> carBuyContractImages = new ArrayList<>(); // 车辆买卖合同
         List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息
         List<FinBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息
         List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息
         List<FinBillFileDto> idCardImagesPC = new ArrayList<>();//证件
-        if (customerInvoiceApplyImages != null){
+        if (appCarBuyContractImages != null) {
+            for (String appCarBuyContractImage : appCarBuyContractImages) {
+                FinBillFileDto finBillFileDto = new FinBillFileDto();
+                finBillFileDto.setFileUrl(appCarBuyContractImage);
+                carBuyContractImages.add(finBillFileDto);
+            }
+        }
+        if (customerInvoiceApplyImages != null) {
             for (String customerInvoiceApplyImage : customerInvoiceApplyImages) {
                 FinBillFileDto finBillFileDto = new FinBillFileDto();
                 finBillFileDto.setFileUrl(customerInvoiceApplyImage);
                 khkpsqsApplicationAppendxs.add(finBillFileDto);
             }
         }
-        if (invoiceApplyConfirmImages != null){
+        if (invoiceApplyConfirmImages != null) {
             for (String invoiceApplyConfirmImage : invoiceApplyConfirmImages) {
                 FinBillFileDto finBillFileDto = new FinBillFileDto();
                 finBillFileDto.setFileUrl(invoiceApplyConfirmImage);
                 kpxxqrsApplicationAppendxs.add(finBillFileDto);
             }
         }
-        if (registerContractImages != null){
+        if (registerContractImages != null) {
             for (String registerContractImage : registerContractImages) {
                 FinBillFileDto finBillFileDto = new FinBillFileDto();
                 finBillFileDto.setFileUrl(registerContractImage);
                 cldjhtApplicationAppendxs.add(finBillFileDto);
             }
         }
-        if (idCardImages != null){
+        if (idCardImages != null) {
             for (String idCardImage : idCardImages) {
                 FinBillFileDto finBillFileDto = new FinBillFileDto();
                 finBillFileDto.setFileUrl(idCardImage);
                 idCardImagesPC.add(finBillFileDto);
             }
         }
+        finBillApplicationDto.setCarBuyContractImages(carBuyContractImages);
         finBillApplicationDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs);
         finBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs);
         finBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
@@ -376,7 +394,7 @@ public class InvoicedService {
     public ResultBean submitInvoicedInfo(SubmitInvoicedInfoDto dto) {
         ResultBean rb = ResultBean.fireFail();
         SubmitFinBillApplicationDto submitBillApplicationDto = new SubmitFinBillApplicationDto();
-        BeanUtil.copyProperties(dto, submitBillApplicationDto);
+        BeanUtil.copyProperties(dto, submitBillApplicationDto, "carBuyContractImages");
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
         submitBillApplicationDto.setUseOrgSid(useOrgSid);
         submitBillApplicationDto.setCreateBySid(dto.getUserSid());
@@ -423,7 +441,7 @@ public class InvoicedService {
         //开票挂车信息
         List<FinBillTrailerDto> finBillTrailers = dto.getFinBillTrailers();
         List<com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto> finBillTrailerDtos = new ArrayList<>();
-        if (finBillTrailers != null && finBillTrailers.size() > 0){
+        if (finBillTrailers != null && finBillTrailers.size() > 0) {
             for (FinBillTrailerDto finBillTrailer : finBillTrailers) {
                 com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto finBillTrailerDto = new com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto();
                 BeanUtil.copyProperties(finBillTrailer, finBillTrailerDto);
@@ -432,42 +450,52 @@ public class InvoicedService {
         }
         submitBillApplicationDto.setFinBillTrailers(finBillTrailerDtos);
         //附件信息
+        List<String> appCarBuyContractImages = dto.getCarBuyContractImages();//车辆买卖合同
         List<String> customerInvoiceApplyImages = dto.getCustomerInvoiceApplyImages();//客户开票申请书
         List<String> invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书
         List<String> registerContractImages = dto.getRegisterContractImages();//车辆登记合同
         List<String> idCardImages = dto.getIdCardImages();//证件
+        List<FinBillFileDto> carBuyContractImages = new ArrayList<>(); // 车辆买卖合同
         List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息
         List<FinBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息
         List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息
         List<FinBillFileDto> idCardImagesPC = new ArrayList<>();//证件
-        if (customerInvoiceApplyImages != null){
+        if (appCarBuyContractImages != null) {
+            for (String appCarBuyContractImage : appCarBuyContractImages) {
+                FinBillFileDto finBillFileDto = new FinBillFileDto();
+                finBillFileDto.setFileUrl(appCarBuyContractImage);
+                carBuyContractImages.add(finBillFileDto);
+            }
+        }
+        if (customerInvoiceApplyImages != null) {
             for (String customerInvoiceApplyImage : customerInvoiceApplyImages) {
                 FinBillFileDto finBillFileDto = new FinBillFileDto();
                 finBillFileDto.setFileUrl(customerInvoiceApplyImage);
                 khkpsqsApplicationAppendxs.add(finBillFileDto);
             }
         }
-        if (invoiceApplyConfirmImages != null){
+        if (invoiceApplyConfirmImages != null) {
             for (String invoiceApplyConfirmImage : invoiceApplyConfirmImages) {
                 FinBillFileDto finBillFileDto = new FinBillFileDto();
                 finBillFileDto.setFileUrl(invoiceApplyConfirmImage);
                 kpxxqrsApplicationAppendxs.add(finBillFileDto);
             }
         }
-        if (registerContractImages != null){
+        if (registerContractImages != null) {
             for (String registerContractImage : registerContractImages) {
                 FinBillFileDto finBillFileDto = new FinBillFileDto();
                 finBillFileDto.setFileUrl(registerContractImage);
                 cldjhtApplicationAppendxs.add(finBillFileDto);
             }
         }
-        if (idCardImages != null){
+        if (idCardImages != null) {
             for (String idCardImage : idCardImages) {
                 FinBillFileDto finBillFileDto = new FinBillFileDto();
                 finBillFileDto.setFileUrl(idCardImage);
                 idCardImagesPC.add(finBillFileDto);
             }
         }
+        submitBillApplicationDto.setCarBuyContractImages(carBuyContractImages);
         submitBillApplicationDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs);
         submitBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs);
         submitBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
@@ -485,42 +513,52 @@ public class InvoicedService {
         BeanUtil.copyProperties(dto, finBillCompleteDto);
         finBillCompleteDto.setOrgSidPath(dto.getOrgPath());
         //附件信息
+        List<String> appCarBuyContractImages = dto.getCarBuyContractImages();//车辆买卖合同
         List<String> customerInvoiceApplyImages = dto.getCustomerInvoiceApplyImages();//客户开票申请书
         List<String> invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书
         List<String> registerContractImages = dto.getRegisterContractImages();//车辆登记合同
         List<String> idCardImages = dto.getIdCardImages();//证件
+        List<FinBillFileDto> carBuyContractImages = new ArrayList<>(); // 车辆买卖合同
         List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息
         List<FinBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息
         List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息
         List<FinBillFileDto> idCardImagesPC = new ArrayList<>();//证件
-        if (customerInvoiceApplyImages != null){
+        if (appCarBuyContractImages != null) {
+            for (String appCarBuyContractImage : appCarBuyContractImages) {
+                FinBillFileDto finBillFileDto = new FinBillFileDto();
+                finBillFileDto.setFileUrl(appCarBuyContractImage);
+                carBuyContractImages.add(finBillFileDto);
+            }
+        }
+        if (customerInvoiceApplyImages != null) {
             for (String customerInvoiceApplyImage : customerInvoiceApplyImages) {
                 FinBillFileDto finBillFileDto = new FinBillFileDto();
                 finBillFileDto.setFileUrl(customerInvoiceApplyImage);
                 khkpsqsApplicationAppendxs.add(finBillFileDto);
             }
         }
-        if (invoiceApplyConfirmImages != null){
+        if (invoiceApplyConfirmImages != null) {
             for (String invoiceApplyConfirmImage : invoiceApplyConfirmImages) {
                 FinBillFileDto finBillFileDto = new FinBillFileDto();
                 finBillFileDto.setFileUrl(invoiceApplyConfirmImage);
                 kpxxqrsApplicationAppendxs.add(finBillFileDto);
             }
         }
-        if (registerContractImages != null){
+        if (registerContractImages != null) {
             for (String registerContractImage : registerContractImages) {
                 FinBillFileDto finBillFileDto = new FinBillFileDto();
                 finBillFileDto.setFileUrl(registerContractImage);
                 cldjhtApplicationAppendxs.add(finBillFileDto);
             }
         }
-        if (idCardImages != null){
+        if (idCardImages != null) {
             for (String idCardImage : idCardImages) {
                 FinBillFileDto finBillFileDto = new FinBillFileDto();
                 finBillFileDto.setFileUrl(idCardImage);
                 idCardImagesPC.add(finBillFileDto);
             }
         }
+        finBillCompleteDto.setCarBuyContractImages(carBuyContractImages);
         finBillCompleteDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs);
         finBillCompleteDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs);
         finBillCompleteDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
@@ -555,10 +593,12 @@ public class InvoicedService {
         FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData();
         if (finBillApplicationDetailsVo != null) {
             //附件信息
+            List<FinBillFileVo> carBuyContractImages = finBillApplicationDetailsVo.getCarBuyContractImages();
             List<FinBillFileVo> khkpsqsApplicationAppendxs = finBillApplicationDetailsVo.getKhkpsqsApplicationAppendxs();
             List<FinBillFileVo> kpxxqrsApplicationAppendxs = finBillApplicationDetailsVo.getKpxxqrsApplicationAppendxs();
             List<FinBillFileVo> cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs();
             List<FinBillFileVo> zjApplicationAppendxs = finBillApplicationDetailsVo.getZjApplicationAppendxs();
+            List<String> appCarBuyContractImages = new ArrayList<>();
             List<String> customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书
             List<String> invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书
             List<String> registerContractImages = new ArrayList<>();//车辆登记合同
@@ -576,7 +616,19 @@ public class InvoicedService {
                 itemEditTextInfo.setFilesPath(idCardImages);
                 itemEditTextInfos.add(itemEditTextInfo);
             }
-            if (khkpsqsApplicationAppendxs != null) {
+            if (carBuyContractImages != null) {
+                for (FinBillFileVo carBuyContractImage : carBuyContractImages) {
+                    appCarBuyContractImages.add(carBuyContractImage.getFileUrl());
+                }
+                ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo();
+                itemEditTextInfo.setTitle("车辆买卖合同");
+                itemEditTextInfo.setType(1);
+                itemEditTextInfo.setNullAble(false);
+                itemEditTextInfo.setKey("carBuyContractImages");
+                itemEditTextInfo.setFilesPath(appCarBuyContractImages);
+                itemEditTextInfos.add(itemEditTextInfo);
+            }
+            /*if (khkpsqsApplicationAppendxs != null) {
                 for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) {
                     customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl());
                 }
@@ -587,8 +639,8 @@ public class InvoicedService {
                 itemEditTextInfo.setKey("customerInvoiceApplyImages");
                 itemEditTextInfo.setFilesPath(customerInvoiceApplyImages);
                 itemEditTextInfos.add(itemEditTextInfo);
-            }
-            if (kpxxqrsApplicationAppendxs != null) {
+            }*/
+            /*if (kpxxqrsApplicationAppendxs != null) {
                 for (FinBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) {
                     invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl());
                 }
@@ -599,7 +651,7 @@ public class InvoicedService {
                 itemEditTextInfo.setKey("invoiceApplyConfirmImages");
                 itemEditTextInfo.setFilesPath(invoiceApplyConfirmImages);
                 itemEditTextInfos.add(itemEditTextInfo);
-            }
+            }*/
             if (cldjhtApplicationAppendxs != null) {
                 for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) {
                     registerContractImages.add(cldjhtApplicationAppendx.getFileUrl());