优化农户管理列表

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

@@ -64,9 +64,12 @@ public class PeasantHouseholdDto  extends BaseDto {
     @TableField(typeHandler = FastjsonTypeHandler.class)
     private List<Integer> permanentAddress;
 
-    @ApiModelProperty(value = "是否勘察 0,1")
+    @ApiModelProperty(value = "是否勘察 0,1,2")
     private Integer surveyOrNot;
 
+    @ApiModelProperty(value = "勘察状态描述")
+    private String surveyOrNotText;
+
     @ApiModelProperty(value = "身份证号")
     private String idCard;
 

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

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.PeasantHouseholdDtoP;
 import com.yeejoin.amos.boot.module.hygf.api.dto.SurveyInformationDto;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.SurveyInformationServiceImpl;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import org.apache.commons.lang3.StringUtils;
@@ -75,12 +76,14 @@ public class PeasantHouseholdController extends BaseController {
 					area = area + re.getRegionName() + "/";
 				}
 		}
-		model.setProjectAddressName(area.substring(0, area.length() - 2));
+		model.setProjectAddressName(area.substring(0, area.length() - 2)+"/"+model.getProjectAddressDetail());
 		if (model.getIsPermanent().size()>0) {
 			model.setPermanentAddress(model.getProjectAddress());
 			model.setPermanentAddressDetail(model.getProjectAddressDetail());
 		}
 		model.setSurveyInformationId(surveyInformationDto.getSequenceNbr());
+		model.setSurveyOrNot(0);
+		model.setReview(0);
 		PeasantHouseholdDto householdDto = peasantHouseholdServiceImpl.createWithModel(model);
 	    return ResponseHelper.buildResponse(householdDto);
 	}
@@ -106,7 +109,7 @@ public class PeasantHouseholdController extends BaseController {
 					area = area + re.getRegionName() + "/";
 				}
 			}
-		model.setProjectAddressName(area.substring(0, area.length() - 2));
+		model.setProjectAddressName(area.substring(0, area.length() - 2)+"/"+model.getProjectAddressDetail());
 		if (model.getIsPermanent().size()>0) {
 			model.setPermanentAddress(model.getProjectAddress());
 			model.setPermanentAddressDetail(model.getProjectAddressDetail());
@@ -160,7 +163,8 @@ public class PeasantHouseholdController extends BaseController {
 	    Page<PeasantHouseholdDto> page = new Page<PeasantHouseholdDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.queryForPeasantHouseholdPage(page));
+		AgencyUserModel userInfo = getUserInfo();
+		return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.queryForPeasantHouseholdPage(page,userInfo.getAgencyCode()));
 	}
 
 	/**

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

@@ -8,6 +8,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 农户信息服务实现类
@@ -20,8 +21,21 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
     /**
      * 分页查询
      */
-    public Page<PeasantHouseholdDto> queryForPeasantHouseholdPage(Page<PeasantHouseholdDto> page)   {
-        return this.queryForPage(page, null, false);
+    public Page<PeasantHouseholdDto> queryForPeasantHouseholdPage(Page<PeasantHouseholdDto> page,String developerCode)   {
+        Page<PeasantHouseholdDto> peasantHouseholdDtoPage = this.queryForPage(page, null, false,developerCode);
+        List<PeasantHouseholdDto> records = peasantHouseholdDtoPage.getRecords();
+        List<PeasantHouseholdDto> newRecords = records.stream().map(item -> {
+            if (item.getSurveyOrNot() == 0) {
+                item.setSurveyOrNotText("待勘察");
+            } else if (item.getSurveyOrNot() == 1) {
+                item.setSurveyOrNotText("已勘察");
+            } else if (item.getSurveyOrNot() == 2) {
+                item.setSurveyOrNotText("已提交审核");
+            }
+            return item;
+        }).collect(Collectors.toList());
+        peasantHouseholdDtoPage.setRecords(newRecords);
+        return peasantHouseholdDtoPage;
     }
 
     /**

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

@@ -113,7 +113,7 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
         BeanUtils.copyProperties(peasantHousehold, surveyInfoAllDto.getSurveyInformation());
 
         if(peasantHousehold.getPermanentAddress() ==null){
-            surveyInfoAllDto.getSurveyInformation().setPermanentAddress(JSON.parseArray("[]", Integer.class));
+            surveyInfoAllDto.getSurveyInformation().setPermanentAddress(peasantHousehold.getProjectAddress());
             surveyInfoAllDto.getSurveyInformation().setIsPermanent(JSON.parseArray("[1]", String.class));
         }
         surveyInfoAllDto.getSurveyInformation().setSequenceNbr(surveyInformation.getSequenceNbr());