农户管理接口联调

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -9,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 农户信息
@@ -53,13 +53,16 @@ public class PeasantHouseholdDto  extends BaseDto {
     private String projectAddress;
 
     @ApiModelProperty(value = "项目地址Arr")
-    private String[] projectAddressArr;
+    private List<Integer> projectAddressArr;
+
+    @ApiModelProperty(value = "常住是否相同")
+    private List<String> isPermanent;
 
     @ApiModelProperty(value = "常住地址")
     private String permanentAddress;
 
     @ApiModelProperty(value = "常住地址Arr")
-    private String[] permanentAddressArr;
+    private List<Integer> permanentAddressArr;
 
     @ApiModelProperty(value = "是否勘察 0,1")
     private Integer surveyOrNot;

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PeasantHouseholdController.java

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PeasantHouseholdDtoP;
@@ -60,28 +61,33 @@ public class PeasantHouseholdController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增农户信息", notes = "新增农户信息")
-	public ResponseModel<PeasantHouseholdDto> save(@RequestBody PeasantHouseholdDtoP model) {
+	public ResponseModel<PeasantHouseholdDto> save(@RequestBody PeasantHouseholdDto model) {
 
 		SurveyInformationDto surveyInformationDto = new SurveyInformationDto();
 		surveyInformationServiceImpl.createWithModel(surveyInformationDto);
 		JSONArray regionName = getRegionName();
 		List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
-
 		// 处理地址
 		String area = "";
-
-		for (String reg : model.getFarmerInformation().getProjectAddressArr())
+		for (Integer reg : model.getProjectAddressArr())
 			for (RegionModel re : list) {
 				if (re.getRegionCode().equals(Integer.valueOf(reg))) {
 					area = area + re.getRegionName() + "/";
 				}
 		}
-		model.getFarmerInformation().setProjectAddressName(area.substring(0, area.length() - 2));
-
-		model.getFarmerInformation().setProjectAddress(StringUtils.joinWith(",", model.getFarmerInformation().getProjectAddressArr()));
-		model.getFarmerInformation().setPermanentAddress(StringUtils.joinWith(",", model.getFarmerInformation().getPermanentAddressArr()));
-		model.getFarmerInformation().setSurveyInformationId(surveyInformationDto.getSequenceNbr());
-		PeasantHouseholdDto householdDto = peasantHouseholdServiceImpl.createWithModel(model.getFarmerInformation());
+		model.setProjectAddressName(area.substring(0, area.length() - 2));
+		if (model.getProjectAddressArr().size()>0) {
+			model.setProjectAddress(JSON.toJSONString(model.getProjectAddressArr()));
+		}
+		if (model.getPermanentAddressArr().size()>0) {
+			model.setPermanentAddress(JSON.toJSONString(model.getPermanentAddressArr()));
+		}
+		if (model.getIsPermanent().size()>0) {
+			model.setPermanentAddress(JSON.toJSONString(model.getProjectAddressArr()));
+			model.setPermanentAddressDetail(model.getProjectAddressDetail());
+		}
+		model.setSurveyInformationId(surveyInformationDto.getSequenceNbr());
+		PeasantHouseholdDto householdDto = peasantHouseholdServiceImpl.createWithModel(model);
 	    return ResponseHelper.buildResponse(householdDto);
 	}
 
@@ -96,6 +102,27 @@ public class PeasantHouseholdController extends BaseController {
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新农户信息", notes = "根据sequenceNbr更新农户信息")
 	public ResponseModel<PeasantHouseholdDto> updateBySequenceNbrPeasantHousehold(@RequestBody PeasantHouseholdDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 	    model.setSequenceNbr(sequenceNbr);
+		JSONArray regionName = getRegionName();
+		List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
+		// 处理地址
+		String area = "";
+		for (Integer reg : model.getProjectAddressArr())
+			for (RegionModel re : list) {
+				if (re.getRegionCode().equals(Integer.valueOf(reg))) {
+					area = area + re.getRegionName() + "/";
+				}
+			}
+		model.setProjectAddressName(area.substring(0, area.length() - 2));
+		if (model.getProjectAddressArr().size()>0) {
+			model.setProjectAddress(JSON.toJSONString(model.getProjectAddressArr()));
+		}
+		if (model.getPermanentAddressArr().size()>0) {
+			model.setPermanentAddress(JSON.toJSONString(model.getPermanentAddressArr()));
+		}
+		if (model.getIsPermanent().size()>0) {
+			model.setPermanentAddress(JSON.toJSONString(model.getProjectAddressArr()));
+			model.setPermanentAddressDetail(model.getProjectAddressDetail());
+		}
 	    return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.updateWithModel(model));
 	}
 
@@ -122,7 +149,16 @@ public class PeasantHouseholdController extends BaseController {
 	@GetMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个农户信息",  notes = "根据sequenceNbr查询单个农户信息")
 	public ResponseModel<PeasantHouseholdDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.queryBySeq(sequenceNbr));
+		PeasantHouseholdDto peasantHouseholdDto = peasantHouseholdServiceImpl.queryBySeq(sequenceNbr);
+		peasantHouseholdDto.setProjectAddressArr(JSON.parseArray(peasantHouseholdDto.getProjectAddress(), Integer.class));
+		if(!StringUtils.isEmpty(peasantHouseholdDto.getPermanentAddress())){
+			peasantHouseholdDto.setPermanentAddressArr(JSON.parseArray(peasantHouseholdDto.getPermanentAddress(), Integer.class));
+		}else {
+			peasantHouseholdDto.setPermanentAddressArr(JSON.parseArray("[]", Integer.class));
+			peasantHouseholdDto.setIsPermanent(JSON.parseArray("[1]", String.class));
+		}
+
+		return ResponseHelper.buildResponse(peasantHouseholdDto);
 	}
 
 	/**