代码提交

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

@@ -91,4 +91,12 @@ public class PeasantHouseholdDto  extends BaseDto {
 
     @ApiModelProperty(value = "项目地址")
     private String projectAddressName;
+
+    @ApiModelProperty(value = "省市区文字集合")
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<String> projectAddressText;
+
+   @ApiModelProperty(value = "常住地址文字")
+   @TableField(typeHandler = FastjsonTypeHandler.class)
+   private List<String> permanentAddressText;
 }

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

@@ -9,12 +9,15 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.SurveyDetails;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IPeasantHouseholdService;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PeasantHouseholdDto;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -81,6 +84,14 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
             } else if (item.getSurveyOrNot() == 2) {
                 item.setSurveyOrNotText("提交审核");
             }
+
+            if (!StringUtils.isEmpty(item.getProjectAddressName())) {
+                item.setProjectAddressText(Arrays.asList(item.getProjectAddressName().split("/")));
+            }
+            if(!StringUtils.isEmpty(item.getPermanentAddressName())){
+                item.setPermanentAddressText(Arrays.asList(item.getPermanentAddressName().split("/")));
+            }
+
             item.setProjectAddressName(item.getProjectAddressName()+"/"+item.getProjectAddressDetail());
             return item;
         }).collect(Collectors.toList());