家访考察优化

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateInitZLVo.java

@@ -9,8 +9,8 @@ import java.util.List;
 @Data
 public class LoanHomeVisitInvestigateInitZLVo implements Vo {
 
-    @ApiModelProperty("定位信息")
+    @ApiModelProperty("定位具体位置")
-    private List<String> location;
+    private String locationStr;
     @ApiModelProperty("房屋照片")
     private List<String> house;
     @ApiModelProperty("门口照片")

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

@@ -10,8 +10,10 @@ import java.util.List;
 public class LoanHomeVisitInvestigateInitJFJZVo implements Vo {
 
     private String sid;
-    @ApiModelProperty("定位信息")
+    @ApiModelProperty("定位坐标")
-    private List<String> location;
+    private String location2;
+    @ApiModelProperty("定位具体位置")
+    private String locationStr;
     @ApiModelProperty("房屋照片")
     private List<String> house;
     @ApiModelProperty("门口照片")

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

@@ -11,8 +11,10 @@ import java.util.List;
 public class LoanHomeVisitInvestigateSaveJFJZDto implements Vo {
 
     private String sid;
-    @ApiModelProperty("定位信息")
+    @ApiModelProperty("定位坐标")
-    private List<String> location = new ArrayList<>();
+    private String location2;
+    @ApiModelProperty("定位具体位置")
+    private String locationStr;
     @ApiModelProperty("房屋照片")
     private List<String> house = new ArrayList<>();;
     @ApiModelProperty("门口照片")

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

@@ -58,5 +58,8 @@ public class LoanHomevisitInvestigateFile extends BaseEntity {
     private String fileUrl; // 附件路径
 	@ApiModelProperty("附件类型")
     private String attachType; // 附件类型
-
+    @ApiModelProperty("定位坐标")
+    private String locationCoord;
+    @ApiModelProperty("定位具体位置")
+    private String locationStr;
 }

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

@@ -53,8 +53,10 @@ public class LoanHomevisitInvestigateFileAllDto implements Dto {
 
     private String sid; // sid
 
-	@ApiModelProperty("定位信息")
+    @ApiModelProperty("定位坐标")
-    private List<String> dwxxImages = new ArrayList<>();
+    private String locationCoord;
+    @ApiModelProperty("定位具体位置")
+    private String locationStr;
     @ApiModelProperty("房屋照片")
     private List<String> fwzpImages = new ArrayList<>();
     @ApiModelProperty("门口照片")

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

@@ -59,5 +59,8 @@ public class LoanHomevisitInvestigateFileDetailsVo implements Vo {
     private String fileUrl; // 附件路径
 	@ApiModelProperty("附件类型")
     private String attachType; // 附件类型
-
+    @ApiModelProperty("定位坐标")
+    private String locationCoord;
+    @ApiModelProperty("定位具体位置")
+    private String locationStr;
 }

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

@@ -59,5 +59,8 @@ public class LoanHomevisitInvestigateFileDto implements Dto {
     private String fileUrl; // 附件路径
 	@ApiModelProperty("附件类型")
     private String attachType; // 附件类型
-
+    @ApiModelProperty("定位坐标")
+    private String locationCoord;
+    @ApiModelProperty("定位具体位置")
+    private String locationStr;
 }

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

@@ -9,7 +9,7 @@ public class LoanHomeVisitInvestigateInitPropVo implements Vo {
 
     private String sid;
     @ApiModelProperty("房产状态")
-    private Boolean houseCheck;
+    private Boolean houseCheck = null;
     @ApiModelProperty("产权类型")
     private int houseState;
     @ApiModelProperty("房产有无贷款value")
@@ -19,7 +19,7 @@ public class LoanHomeVisitInvestigateInitPropVo implements Vo {
     @ApiModelProperty("房产备注")
     private String houseRemarks;
     @ApiModelProperty("车辆状态")
-    private Boolean carCheck;
+    private Boolean carCheck = null;
     @ApiModelProperty("车辆类型")
     private int carState;
     @ApiModelProperty("车辆有无贷款value")

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

@@ -395,10 +395,34 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         LoanHomeVisitInvestigateInitReportStateVo loanHomeVisitInvestigateInitReportStateVo = new LoanHomeVisitInvestigateInitReportStateVo();
         //客户信息状态
         LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.selByMainSid(sid);
+        List<LoanHomevisitInvestigateFileDetailsVo> loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType());
         if (loanHomevisitInvestigateCustomerDetailsVo == null) {
             loanHomeVisitInvestigateInitReportStateVo.setCustomerState(0);
         } else {
-            if (StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getBankCardNo())) {
+            if (StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerName())
+                    || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerIdNumber())
+                    || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerMobile())
+                    || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerCareerValue())
+                    || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getMaritalStatusValue())
+                    || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getIsChildrenValue())
+                    || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerDomAddress())
+                    || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerPreAddress())
+                    || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getDepositBank())
+                    || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getEmergencyContact())
+                    || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getEmergencyMobile())
+                    || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getRelationshipValue())
+                    || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getBankCardNo())) {
+                loanHomeVisitInvestigateInitReportStateVo.setCustomerState(0);
+            } else if ("0004".equals(loanHomevisitInvestigateCustomerDetailsVo.getMaritalStatusKey())) {
+                if (StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getSpouseName())
+                        || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getSpouseIdNumber())
+                        || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getSpouseMobile())
+                        || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getSpouseCareerValue())
+                        || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getSpouseDomAddress())
+                        || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getSpousePreAddress())) {
+                    loanHomeVisitInvestigateInitReportStateVo.setCustomerState(0);
+                }
+            } else if (loanHomevisitInvestigateFileDetailsVos == null || loanHomevisitInvestigateFileDetailsVos.size() == 0) {
                 loanHomeVisitInvestigateInitReportStateVo.setCustomerState(0);
             } else {
                 loanHomeVisitInvestigateInitReportStateVo.setCustomerState(1);
@@ -407,7 +431,9 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())) {
                 loanHomeVisitInvestigateInitReportStateVo.setOtherState(1);
             } else if ("2".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())) {
-                if (StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getIsSecurity()) || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getAccCompName()) || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getAccCompRegistNum())) {
+                if (StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getIsSecurity())
+                        || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getAccCompName())
+                        || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getAccCompRegistNum())) {
                     loanHomeVisitInvestigateInitReportStateVo.setOtherState(0);
                 } else {
                     loanHomeVisitInvestigateInitReportStateVo.setOtherState(1);
@@ -425,28 +451,74 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         if (loanHomevisitInvestigateOrderDetailsVo == null) {
             loanHomeVisitInvestigateInitReportStateVo.setOrderState(0);
         } else {
-            loanHomeVisitInvestigateInitReportStateVo.setOrderState(1);
+            if (StringUtils.isBlank(loanHomevisitInvestigateOrderDetailsVo.getCarConfirm())
+                    || StringUtils.isBlank(loanHomevisitInvestigateOrderDetailsVo.getFinConfirm())
+                    || StringUtils.isBlank(loanHomevisitInvestigateOrderDetailsVo.getFinDownPay())) {
+                loanHomeVisitInvestigateInitReportStateVo.setOrderState(0);
+            } else {
+                loanHomeVisitInvestigateInitReportStateVo.setOrderState(1);
+            }
         }
         //运营经历信息
         LoanHomevisitInvestigateOperationsDetailsVo loanHomevisitInvestigateOperationsDetailsVo = loanHomevisitInvestigateOperationsService.selByMainSid(sid);
         if (loanHomevisitInvestigateOperationsDetailsVo == null) {
             loanHomeVisitInvestigateInitReportStateVo.setOperationState(0);
         } else {
-            loanHomeVisitInvestigateInitReportStateVo.setOperationState(1);
+            if (StringUtils.isBlank(loanHomevisitInvestigateOperationsDetailsVo.getIndustryYears())
+                    || StringUtils.isBlank(loanHomevisitInvestigateOperationsDetailsVo.getDriveProTypeValue())
+                    || StringUtils.isBlank(loanHomevisitInvestigateOperationsDetailsVo.getBeforeOpeTypeValue())) {
+                loanHomeVisitInvestigateInitReportStateVo.setOperationState(0);
+            } else {
+                loanHomeVisitInvestigateInitReportStateVo.setOperationState(1);
+            }
         }
         //运输情况信息
         LoanHomevisitInvestigateTransportDetailsVo loanHomevisitInvestigateTransportDetailsVo = loanHomevisitInvestigateTransportService.selByMainSid(sid);
         if (loanHomevisitInvestigateTransportDetailsVo == null) {
             loanHomeVisitInvestigateInitReportStateVo.setTransportState(0);
         } else {
-            loanHomeVisitInvestigateInitReportStateVo.setTransportState(1);
+            if (StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getTransportRoute())
+                    || StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getTransportTypeValue())
+                    || StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getTransportGoodsTrip())
+                    || StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getTransportGoodsRetTrip())
+                    || StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getRoundTripMileage())
+                    || StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getDeadWeight())
+                    || StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getMonthlyTrip())
+                    || StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getPerTripYuan())
+                    || StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getFuelConsumptionPerTrip())
+                    || StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getDriverSalary())
+                    || StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getToll())
+                    || StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getMaintenance())
+                    || StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getExpectedRevenue())
+                    || StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getNetIncome())) {
+                loanHomeVisitInvestigateInitReportStateVo.setTransportState(0);
+            } else {
+                loanHomeVisitInvestigateInitReportStateVo.setTransportState(1);
+            }
         }
         //资产情况信息
         LoanHomevisitInvestigatePropertyDetailsVo loanHomevisitInvestigatePropertyDetailsVo = loanHomevisitInvestigatePropertyService.selByMainSid(sid);
         if (loanHomevisitInvestigatePropertyDetailsVo == null) {
             loanHomeVisitInvestigateInitReportStateVo.setAssetsState(0);
         } else {
-            loanHomeVisitInvestigateInitReportStateVo.setAssetsState(1);
+            if (loanHomevisitInvestigatePropertyDetailsVo.getIsRealEstate()) {
+                if (loanHomevisitInvestigatePropertyDetailsVo.getPropertyType() == 0
+                        || StringUtils.isBlank(loanHomevisitInvestigatePropertyDetailsVo.getRealLoanSituation())) {
+                    loanHomeVisitInvestigateInitReportStateVo.setAssetsState(0);
+                }
+            } else if (loanHomevisitInvestigatePropertyDetailsVo.getIsCar()) {
+                if (loanHomevisitInvestigatePropertyDetailsVo.getCarType() == 0
+                        || StringUtils.isBlank(loanHomevisitInvestigatePropertyDetailsVo.getCarLoanSituation())) {
+                    loanHomeVisitInvestigateInitReportStateVo.setAssetsState(0);
+                }
+            } else if (loanHomevisitInvestigatePropertyDetailsVo.getIsRealEstate() == null || loanHomevisitInvestigatePropertyDetailsVo.getIsCar() == null) {
+                loanHomeVisitInvestigateInitReportStateVo.setAssetsState(0);
+            } else if (StringUtils.isBlank(loanHomevisitInvestigatePropertyDetailsVo.getDownPaySourceValue())
+                    || StringUtils.isBlank(loanHomevisitInvestigatePropertyDetailsVo.getOtherSourceValue())) {
+                loanHomeVisitInvestigateInitReportStateVo.setAssetsState(0);
+            } else {
+                loanHomeVisitInvestigateInitReportStateVo.setAssetsState(1);
+            }
         }
         return rb.success().setData(loanHomeVisitInvestigateInitReportStateVo);
     }
@@ -503,7 +575,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         } else {
             loanHomeVisitInvestigateInitInformationStateVo.setWitnessState(1);
         }
-        //证明文件
+        //证明文件-贷款人
         if (dkrsfzImages == null || dkrsfzImages.size() == 0) {
             loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
         } else if (dkrhkbImages == null || dkrhkbImages.size() == 0) {
@@ -514,10 +586,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
         } else if (dkryhlsImages == null || dkryhlsImages.size() == 0) {
             loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
-        } else if (dbrsfzImages == null || dbrsfzImages.size() == 0) {
-            loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
-        } else if (dbrhkbImages == null || dbrhkbImages.size() == 0) {
-            loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
         } else {
             loanHomeVisitInvestigateInitInformationStateVo.setProofState(1);
         }
@@ -533,6 +601,21 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
                 }
             }
         }
+        //证明文件-担保人
+        List<LoanHomeVisitInvestigateInitOtherPeoVo> loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid);
+        if (loanHomeVisitInvestigateInitOtherPeoVos != null && loanHomeVisitInvestigateInitOtherPeoVos.size() > 0) {
+            for (LoanHomeVisitInvestigateInitOtherPeoVo loanHomeVisitInvestigateInitOtherPeoVo : loanHomeVisitInvestigateInitOtherPeoVos) {
+                if ("1".equals(loanHomeVisitInvestigateInitOtherPeoVo.getPersonnelKey())) {
+                    if (dbrsfzImages == null || dbrsfzImages.size() == 0) {
+                        loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
+                    } else if (dbrhkbImages == null || dbrhkbImages.size() == 0) {
+                        loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
+                    } else {
+                        loanHomeVisitInvestigateInitInformationStateVo.setProofState(1);
+                    }
+                }
+            }
+        }
         //资产类
         if (yhkImages == null || yhkImages.size() == 0) {
             loanHomeVisitInvestigateInitInformationStateVo.setAssetsInfo(0);
@@ -683,6 +766,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomevisitInvestigateOtherpeoDto.setMainSid(dto.getSid());
             loanHomevisitInvestigateOtherpeoService.saveOrUpdateDto(loanHomevisitInvestigateOtherpeoDto);
         }
+        if (!otherPersonnel.stream().anyMatch(p -> p.getPersonnelKey().equals("1"))) {
+            loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.DBRSFZ.getAttachType());
+            loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.DBRHKB.getAttachType());
+        }
         return rb.success();
     }
 
@@ -845,13 +932,12 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         LoanHomeVisitInvestigateInitJFJZVo loanHomeVisitInvestigateInitJFJZVo = new LoanHomeVisitInvestigateInitJFJZVo();
         //定位信息
         List<LoanHomevisitInvestigateFileDetailsVo> dwxxImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DWXX.getAttachType());
-        List<String> location = new ArrayList<>();
         if (dwxxImages != null && dwxxImages.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo dwxxImage : dwxxImages) {
-                location.add(dwxxImage.getFileUrl());
+                loanHomeVisitInvestigateInitJFJZVo.setLocation2(dwxxImage.getLocationCoord());
+                loanHomeVisitInvestigateInitJFJZVo.setLocationStr(dwxxImage.getLocationStr());
             }
         }
-        loanHomeVisitInvestigateInitJFJZVo.setLocation(location);
         //房屋照片
         List<LoanHomevisitInvestigateFileDetailsVo> fwzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FWZP.getAttachType());
         List<String> house = new ArrayList<>();
@@ -896,16 +982,12 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         ResultBean rb = ResultBean.fireFail();
         //定位信息
         loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.DWXX.getAttachType());
-        for (String dwxx : dto.getLocation()) {
+        LoanHomevisitInvestigateFileDto dwxxFileDto = new LoanHomevisitInvestigateFileDto();
-            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+        dwxxFileDto.setMainSid(dto.getSid());
-            loanHomevisitInvestigateFileDto.setMainSid(dto.getSid());
+        dwxxFileDto.setAttachType(LoanAttachTypeEnum.DWXX.getAttachType());
-            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DWXX.getAttachType());
+        dwxxFileDto.setLocationCoord(dto.getLocation2());
-            if (dwxx.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+        dwxxFileDto.setLocationStr(dto.getLocationStr());
-                dwxx = dwxx.replace(fileUploadComponent.getUrlPrefix(), "");
+        loanHomevisitInvestigateFileService.saveOrUpdateDto(dwxxFileDto);
-            }
-            loanHomevisitInvestigateFileDto.setFileUrl(dwxx);
-            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-        }
         //房屋照片
         loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.FWZP.getAttachType());
         for (String fwzp : dto.getHouse()) {
@@ -1252,10 +1334,22 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         LoanHomevisitInvestigate loanHomevisitInvestigate = fetchBySid(sid);
         LoanHomeVisitInvestigateInitReportStateVo loanHomeVisitInvestigateInitReportStateVo = getHomeVisitReportInfo(sid).getData();
         LoanHomeVisitInvestigateInitInformationStateVo loanHomeVisitInvestigateInitInformationStateVo = getHomeVisitDataInfo(sid).getData();
-        if (loanHomeVisitInvestigateInitReportStateVo.getOperationState() == 0) {
+        if (loanHomeVisitInvestigateInitReportStateVo.getCustomerState() == 0) {
+            return rb.setMsg("家访考察报告-客户信息未完善");
+        } else if (loanHomeVisitInvestigateInitReportStateVo.getOtherState() == 0) {
+            return rb.setMsg("家访考察报告-其他补充信息未完善");
+        } else if (loanHomeVisitInvestigateInitReportStateVo.getOrderState() == 0) {
+            return rb.setMsg("家访考察报告-订单信息未完善");
+        } else if (loanHomeVisitInvestigateInitReportStateVo.getOperationState() == 0) {
             return rb.setMsg("家访考察报告-营运经历未完善");
         } else if (loanHomeVisitInvestigateInitReportStateVo.getTransportState() == 0) {
             return rb.setMsg("家访考察报告-运输信息未完善");
+        } else if (loanHomeVisitInvestigateInitReportStateVo.getAssetsState() == 0) {
+            return rb.setMsg("家访考察报告-资产情况未完善");
+        } else if (loanHomeVisitInvestigateInitInformationStateVo.getWitnessState() == 0) {
+            return rb.setMsg("家防资料-家访见证类未完善");
+        } else if (loanHomeVisitInvestigateInitInformationStateVo.getProofState() == 0) {
+            return rb.setMsg("家防资料-证明文件未完善");
         } else if (loanHomeVisitInvestigateInitInformationStateVo.getAssetsInfo() == 0) {
             return rb.setMsg("家防资料-资产类未完善");
         }
@@ -1691,13 +1785,11 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         LoanHomeVisitInvestigateInitZLVo loanHomeVisitInvestigateInitZLVo = new LoanHomeVisitInvestigateInitZLVo();
         //定位信息
         List<LoanHomevisitInvestigateFileDetailsVo> dwxxImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DWXX.getAttachType());
-        List<String> location = new ArrayList<>();
         if (dwxxImages != null && dwxxImages.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo dwxxImage : dwxxImages) {
-                location.add(dwxxImage.getFileUrl());
+                loanHomeVisitInvestigateInitZLVo.setLocationStr(dwxxImage.getLocationStr());
             }
         }
-        loanHomeVisitInvestigateInitZLVo.setLocation(location);
         //房屋照片
         List<LoanHomevisitInvestigateFileDetailsVo> fwzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FWZP.getAttachType());
         List<String> house = new ArrayList<>();

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

@@ -25,6 +25,8 @@
                createByName,
                concat(#{path}, fileUrl) as fileUrl,
                attachType,
+               locationCoord,
+               locationStr,
                mainSid
         from loan_homevisit_investigate_file
         where mainSid = #{sid}

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

@@ -112,16 +112,12 @@ public class LoanHomevisitInvestigateFileService extends MybatisBaseService<Loan
     public ResultBean saveOrUpdateAllDto(LoanHomevisitInvestigateFileAllDto dto) {
         ResultBean rb = ResultBean.fireFail();
         //定位信息
-        for (String dwxxImage : dto.getDwxxImages()) {
+        LoanHomevisitInvestigateFileDto dwxxFileDto = new LoanHomevisitInvestigateFileDto();
-            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+        dwxxFileDto.setLocationCoord(dto.getLocationCoord());
-            if (dwxxImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+        dwxxFileDto.setLocationStr(dto.getLocationStr());
-                dwxxImage = dwxxImage.replace(fileUploadComponent.getUrlPrefix(), "");
+        dwxxFileDto.setSid(dto.getSid());
-            }
+        dwxxFileDto.setAttachType(LoanAttachTypeEnum.DWXX.getAttachType());
-            loanHomevisitInvestigateFileDto.setFileUrl(dwxxImage);
+        saveOrUpdateDto(dwxxFileDto);
-            loanHomevisitInvestigateFileDto.setSid(dto.getSid());
-            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DWXX.getAttachType());
-            saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-        }
         //房屋照片
         for (String fwzpImage : dto.getFwzpImages()) {
             LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@@ -362,10 +362,10 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         String urlAllVo = "";
         List<File> filesList = new ArrayList<>();
         //贷款人生成车辆买卖合同
-        /*List<File> xcmmContractUrls = commonContractFeign.xcmmContract(printConfirmDto).getData();
+        List<File> xcmmContractUrls = commonContractFeign.xcmmContract(printConfirmDto).getData();
         for (File xcmmContractUrl : xcmmContractUrls) {
             filesList.add(xcmmContractUrl);
-        }*/
+        }
         if (conSetUpKey.equals("001")) {//一车一合同
             for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
                 List<SalesOrderVehicle> salesOrderVehicles = new ArrayList<>();
@@ -392,7 +392,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                 busSalesOrderLoancontractDto.setBusName("资方终审确认");
                 String loanContractSid = busSalesOrderLoancontractFeign.save(busSalesOrderLoancontractDto).getData();
                 busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanContractSid);
-               /* //生成车辆融资协议
+                //生成车辆融资协议
                 String clrzxyUrl = generateCLRZXY(printConfirmDto);
                 //生成还款协议
                 String hkxyUrl = hkxy(printConfirmDto);
@@ -421,7 +421,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                 if (StringUtils.isNotBlank(gsgddwdbjy)) {
                     File file = new File(docPdfComponent.getUploadTemplateUrl() + gsgddwdbjy);
                     filesList.add(file);
-                }*/
+                }
             }
         } else if (conSetUpKey.equals("002")) {//一人一合同
             List<SalesOrderVehicle> salesOrderVehicles = new ArrayList<>();
@@ -452,7 +452,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
                 busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanContractSid);
             }
-            /*//生成车辆融资协议
+            //生成车辆融资协议
             String clrzxyUrl = generateCLRZXY(printConfirmDto);
             //生成还款协议
             String hkxy = hkxy(printConfirmDto);
@@ -481,7 +481,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             if (StringUtils.isNotBlank(gsgddwdbjy)) {
                 File file = new File(docPdfComponent.getUploadTemplateUrl() + gsgddwdbjy);
                 filesList.add(file);
-            }*/
+            }
         }
         //合并pdf文件
         if (filesList.size() > 0) {
@@ -680,7 +680,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                         map.put("partyEaddress", homeKcOtherPeo.getResidentAddress());
                         //戊方实际居住地址
                         map.put("partyExaddress", homeKcOtherPeo.getAddress());
-                        otherPersonnel.remove(otherPersonnel);
+                        otherPersonnel.remove(homeKcOtherPeo);
                         break;
                     }
                 }

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

@@ -10,8 +10,10 @@ import java.util.List;
 public class AppLoanHomeVisitInvestigateInitJFJZVo implements Vo {
 
     private String sid;
-    @ApiModelProperty("定位信息")
+    @ApiModelProperty("定位坐标")
-    private List<String> location;
+    private String location2;
+    @ApiModelProperty("定位具体位置")
+    private String locationStr;
     @ApiModelProperty("房屋照片")
     private List<String> house;
     @ApiModelProperty("门口照片")

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

@@ -9,7 +9,7 @@ public class AppLoanHomeVisitInvestigateInitPropVo implements Vo {
 
     private String sid;
     @ApiModelProperty("房产状态")
-    private Boolean houseCheck;
+    private Boolean houseCheck = null;
     @ApiModelProperty("产权类型")
     private int houseState;
     @ApiModelProperty("房产有无贷款value")
@@ -19,7 +19,7 @@ public class AppLoanHomeVisitInvestigateInitPropVo implements Vo {
     @ApiModelProperty("房产备注")
     private String houseRemarks;
     @ApiModelProperty("车辆状态")
-    private Boolean carCheck;
+    private Boolean carCheck = null;
     @ApiModelProperty("车辆类型")
     private int carState;
     @ApiModelProperty("车辆有无贷款value")

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

@@ -9,8 +9,8 @@ import java.util.List;
 @Data
 public class AppLoanHomeVisitInvestigateInitZLVo implements Vo {
 
-    @ApiModelProperty("定位信息")
+    @ApiModelProperty("定位具体位置")
-    private List<String> location;
+    private String locationStr;
     @ApiModelProperty("房屋照片")
     private List<String> house;
     @ApiModelProperty("门口照片")

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

@@ -10,8 +10,10 @@ import java.util.List;
 public class AppLoanHomeVisitInvestigateSaveJFJZDto implements Vo {
 
     private String sid;
-    @ApiModelProperty("定位信息")
+    @ApiModelProperty("定位坐标")
-    private List<String> location;
+    private String location2;
+    @ApiModelProperty("定位具体位置")
+    private String locationStr;
     @ApiModelProperty("房屋照片")
     private List<String> house;
     @ApiModelProperty("门口照片")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java

@@ -218,7 +218,10 @@ public class LoanHomeVisitInvestigateService {
         loanHomeVisitInvestigateSaveCustomerDto.setIsCompBuy(loanHomevisitInvestigateCustomerDetailsVo.getIsCompBuy());
         loanHomeVisitInvestigateSaveCustomerDto.setConSetUpKey(loanHomevisitInvestigateCustomerDetailsVo.getConSetUpKey());
         loanHomeVisitInvestigateSaveCustomerDto.setContractUrl(loanHomevisitInvestigateCustomerDetailsVo.getContractUrl());
-        loanHomevisitInvestigateFeign.saveHomeVisitCustomerInfo(loanHomeVisitInvestigateSaveCustomerDto);
+        ResultBean resultBean = loanHomevisitInvestigateFeign.saveHomeVisitCustomerInfo(loanHomeVisitInvestigateSaveCustomerDto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
         return rb.success();
     }
 
@@ -277,7 +280,10 @@ public class LoanHomeVisitInvestigateService {
         }else {
             return rb.setMsg("请优先完善客户信息");
         }
-        loanHomevisitInvestigateFeign.saveHomeVisitCustomerInfo(loanHomeVisitInvestigateSaveCustomerDto);
+        ResultBean resultBean = loanHomevisitInvestigateFeign.saveHomeVisitCustomerInfo(loanHomeVisitInvestigateSaveCustomerDto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
         return rb.success();
     }