代码提交

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/SurveyInformationDto.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 勘察信息
@@ -76,9 +77,12 @@ public class SurveyInformationDto  extends BaseDto {
     private String permanentAddress;
 
     @ApiModelProperty(value = "项目地址Arr")
-    private Integer[] projectAddressArr;
+    private List<Integer> projectAddressArr;
 
     @ApiModelProperty(value = "常住地址Arr")
-    private Integer[] permanentAddressArr;
+    private List<Integer> permanentAddressArr;
+
+    @ApiModelProperty(value = "常住是否相同")
+    private List<String> isPermanent;
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/SurveyInformationServiceImpl.java

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -106,17 +107,25 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
 
         BeanUtils.copyProperties(peasantHousehold, surveyInfoAllDto.getSurveyInformation());
 
-        if(StringUtils.isNotEmpty(peasantHousehold.getProjectAddress())) {
-            String[] pArr = peasantHousehold.getProjectAddress().split(",");
-            Integer[] convert = (Integer[]) ConvertUtils.convert(pArr, Integer.class);
-            surveyInfoAllDto.getSurveyInformation().setProjectAddressArr(convert);
+        surveyInfoAllDto.getSurveyInformation().setProjectAddressArr(JSON.parseArray(peasantHousehold.getProjectAddress(), Integer.class));
+        if(!StringUtils.isEmpty(peasantHousehold.getPermanentAddress())){
+            surveyInfoAllDto.getSurveyInformation().setPermanentAddressArr(JSON.parseArray(peasantHousehold.getPermanentAddress(), Integer.class));
+        }else {
+            surveyInfoAllDto.getSurveyInformation().setPermanentAddressArr(JSON.parseArray("[]", Integer.class));
+            surveyInfoAllDto.getSurveyInformation().setIsPermanent(JSON.parseArray("[1]", String.class));
         }
 
-        if(StringUtils.isNotEmpty(peasantHousehold.getPermanentAddress())) {
-            String[] eArr =  peasantHousehold.getPermanentAddress().split(",");
-            Integer[] convert1 = (Integer[]) ConvertUtils.convert(eArr, Integer.class);
-            surveyInfoAllDto.getSurveyInformation().setPermanentAddressArr(convert1);
-        }
+//        if(StringUtils.isNotEmpty(peasantHousehold.getProjectAddress())) {
+//            String[] pArr = peasantHousehold.getProjectAddress().split(",");
+//            Integer[] convert = (Integer[]) ConvertUtils.convert(pArr, Integer.class);
+//            surveyInfoAllDto.getSurveyInformation().setProjectAddressArr(convert);
+//        }
+//
+//        if(StringUtils.isNotEmpty(peasantHousehold.getPermanentAddress())) {
+//            String[] eArr =  peasantHousehold.getPermanentAddress().split(",");
+//            Integer[] convert1 = (Integer[]) ConvertUtils.convert(eArr, Integer.class);
+//            surveyInfoAllDto.getSurveyInformation().setPermanentAddressArr(convert1);
+//        }
 
         QueryWrapper<SurveyDetails> surveyDetailsQueryWrapper = new QueryWrapper<>();
         surveyDetailsQueryWrapper.eq("survey_information_id", surveyInformationId);