Merge remote-tracking branch 'origin/master'

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

@@ -60,8 +60,10 @@ public class LoanHomevisitFileexamineDetailsVo implements Vo {
     @ApiModelProperty("销售订单sid")
     private String saleOrderSid;
 
-    @ApiModelProperty("定位信息")
+    @ApiModelProperty("定位坐标")
-    private List<String> location = new ArrayList<>();
+    private String locationCoord;
+    @ApiModelProperty("定位具体位置")
+    private String locationStr;
     @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,10 @@ public class LoanHomevisitFileexamineDto implements Dto {
     @ApiModelProperty("是否为单独保存(1是)")
     private String isSave;
 
-    @ApiModelProperty("定位信息")
+    @ApiModelProperty("定位坐标")
-    private List<String> location = new ArrayList<>();
+    private String locationCoord;
+    @ApiModelProperty("定位具体位置")
+    private String locationStr;
     @ApiModelProperty("房屋照片")
     private List<String> house = new ArrayList<>();
     @ApiModelProperty("门口照片")

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

@@ -508,6 +508,14 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         }
         vo.setLoanXdCons(loanXdConDetailsVos);
         vo.setLoanZfCons(loanZfConDetailsVos);
+        //定位信息
+        List<LoanHomevisitInvestigateFileDetailsVo> dwxxImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.DWXX.getAttachType());
+        if (dwxxImages != null && dwxxImages.size() > 0){
+            for (LoanHomevisitInvestigateFileDetailsVo dwxxImage : dwxxImages) {
+                vo.setLocationCoord(dwxxImage.getLocationCoord());
+                vo.setLocationStr(dwxxImage.getLocationStr());
+            }
+        }
         //房屋照片
         List<LoanHomevisitInvestigateFileDetailsVo> fwzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.FWZP.getAttachType());
         List<String> house = new ArrayList<>();

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

@@ -64,7 +64,7 @@ public interface LoanHomevisitInvestigateFileMapper extends BaseMapper<LoanHomev
 
     List<LoanHomevisitInvestigateFileDetailsVo> selByMainSidAndTypeKey(@Param("sid") String sid, @Param("attachType") String attachType, @Param("path") String path);
 
-    @Delete("delete from loan_homevisit_investigate_file where mainSid = #{dtoSid}")
+    @Delete("delete from loan_homevisit_investigate_file where mainSid = #{dtoSid} and attachType != '001'")
     void delByMainSid(String dtoSid);
 
     @Delete("delete from loan_homevisit_investigate_file where mainSid = #{dtoSid} and attachType =#{type}")