Merge remote-tracking branch 'origin/master'

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

@@ -59,8 +59,6 @@ public class LoanHomevisitFileexamineDetailsVo implements Vo {
     @ApiModelProperty("销售订单sid")
     private String saleOrderSid;
 
-    @ApiModelProperty("定位信息")
-    private List<String> location;
     @ApiModelProperty("房屋照片")
     private List<String> house;
     @ApiModelProperty("门口照片")

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

@@ -60,8 +60,6 @@ public class LoanHomevisitFileexamineDto implements Dto {
     @ApiModelProperty("是否为单独保存(1是)")
     private String isSave;
 
-    @ApiModelProperty("定位信息")
-    private List<String> location = new ArrayList<>();
     @ApiModelProperty("房屋照片")
     private List<String> house = new ArrayList<>();
     @ApiModelProperty("门口照片")

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

@@ -212,17 +212,6 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
             return;
         }
         loanHomevisitInvestigateFileService.delByMainSid(dto.getHomeVisitSid());
-        //定位信息
-        for (String dwxx : dto.getLocation()) {
-            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid());
-            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DWXX.getAttachType());
-            if (dwxx.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-                dwxx = dwxx.replace(fileUploadComponent.getUrlPrefix(), "");
-            }
-            loanHomevisitInvestigateFileDto.setFileUrl(dwxx);
-            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-        }
         //房屋照片
         for (String fwzp : dto.getHouse()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
@@ -519,15 +508,6 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         }
         vo.setLoanXdCons(loanXdConDetailsVos);
         vo.setLoanZfCons(loanZfConDetailsVos);
-        //定位信息
-        List<LoanHomevisitInvestigateFileDetailsVo> dwxxImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.DWXX.getAttachType());
-        List<String> location = new ArrayList<>();
-        if (dwxxImages != null && dwxxImages.size() > 0) {
-            for (LoanHomevisitInvestigateFileDetailsVo dwxxImage : dwxxImages) {
-                location.add(dwxxImage.getFileUrl());
-            }
-        }
-        vo.setLocation(location);
         //房屋照片
         List<LoanHomevisitInvestigateFileDetailsVo> fwzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.FWZP.getAttachType());
         List<String> house = new ArrayList<>();