Skip to content

A
amos-boot-zx-biz
Commit cc112914 authored by chenzhao's avatar chenzhao
Browse files
Options

Merge remote-tracking branch 'origin/developer_bw' into developer_bw

parents 31f82bdf fdd53d8f
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/SurveyInformationServiceImpl.java
View file @ cc112914
...@@ -164,6 +164,7 @@ public class SurveyInformationServiceImpl ...@@ -164,6 +164,7 @@ public class SurveyInformationServiceImpl
JSONArray regionName = getRegionName(); JSONArray regionName = getRegionName();
List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class); List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
// 更新勘察基本信息 // 更新勘察基本信息
SurveyInformation surveyInformation = BeanDtoUtils.convert(surveyInfoAllDto.getSurveyInformation(), SurveyInformation surveyInformation = BeanDtoUtils.convert(surveyInfoAllDto.getSurveyInformation(),
SurveyInformation.class); SurveyInformation.class);
...@@ -266,12 +267,12 @@ public class SurveyInformationServiceImpl ...@@ -266,12 +267,12 @@ public class SurveyInformationServiceImpl
peasantHousehold.setIdCard(surveyInfoAllDto.getSurveyInformation().getIdCard()); peasantHousehold.setIdCard(surveyInfoAllDto.getSurveyInformation().getIdCard());
peasantHousehold.setMailbox(surveyInfoAllDto.getSurveyInformation().getMailbox()); peasantHousehold.setMailbox(surveyInfoAllDto.getSurveyInformation().getMailbox());
peasantHousehold.setProjectAddress(surveyInfoAllDto.getSurveyInformation().getProjectAddress()); peasantHousehold.setProjectAddress(surveyInfoAllDto.getSurveyInformation().getProjectAddress());
peasantHousehold.setProjectAddressDetail(surveyInfoAllDto.getSurveyInformation().getProjectAddressDetail()); peasantHousehold.setProjectAddressDetail(surveyInfoAllDto.getSurveyInformation().getProjectAddressDetail() != null ? surveyInfoAllDto.getSurveyInformation().getProjectAddressDetail(): "" );
peasantHousehold.setPermanentAddress(surveyInfoAllDto.getSurveyInformation().getPermanentAddress()); peasantHousehold.setPermanentAddress(surveyInfoAllDto.getSurveyInformation().getPermanentAddress());
peasantHousehold peasantHousehold
.setPermanentAddressDetail(surveyInfoAllDto.getSurveyInformation().getPermanentAddressDetail()); .setPermanentAddressDetail(surveyInfoAllDto.getSurveyInformation().getPermanentAddressDetail() != null ? surveyInfoAllDto.getSurveyInformation().getPermanentAddressDetail() : "");
peasantHousehold // peasantHousehold
.setPermanentAddressDetail(surveyInfoAllDto.getSurveyInformation().getPermanentAddressDetail()); // .setPermanentAddressDetail(surveyInfoAllDto.getSurveyInformation().getPermanentAddressDetail() != null ? surveyInfoAllDto.getSurveyInformation().getPermanentAddressDetail(): "");
// 处理项目地址 // 处理项目地址
String projectAddressName = ""; String projectAddressName = "";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment