优化：农户修改时，参数丢失的问题

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

@@ -10,6 +10,7 @@ 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;
+import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -151,7 +152,9 @@ public class PeasantHouseholdController extends BaseController {
 				}
 			model.setPermanentAddressName(permanentAddressName.substring(0, permanentAddressName.length() - 2));
 		}
-	    return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.updateWithModel(model));
+		PeasantHouseholdDto peasantHouseholdDto = peasantHouseholdServiceImpl.queryBySeq(sequenceNbr);
+		BeanUtils.copyProperties(model,peasantHouseholdDto);
+		return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.updateWithModel(peasantHouseholdDto));
 	}
 
 	/**

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

@@ -77,13 +77,15 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         Page<PeasantHouseholdDto> peasantHouseholdDtoPage = this.queryForPage(page, "rec_date", false,developerCode,ownersName);
         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("提交审核");
-            }
+           if(item.getSurveyOrNot() != null){
+               if (item.getSurveyOrNot() == 0) {
+                   item.setSurveyOrNotText("待勘察");
+               } else if (item.getSurveyOrNot() == 1) {
+                   item.setSurveyOrNotText("已勘察");
+               } else if (item.getSurveyOrNot() == 2) {
+                   item.setSurveyOrNotText("提交审核");
+               }
+           }
 
             if (!StringUtils.isEmpty(item.getProjectAddressName())) {
                 item.setProjectAddressText(Arrays.asList(item.getProjectAddressName().split("/")));