勘察信息显示字段调整

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -37,6 +38,8 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 勘察信息服务实现类
@@ -458,17 +461,20 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
         informationQueryWrapper.eq("survey_information_id", surveyInformationId);
         Information information = informationService.getBaseMapper().selectOne(informationQueryWrapper);
 
-        if(information == null){
-            surveyInfoAllDto.setInformation(new InformationDto());
-        }else {
-            surveyInfoAllDto.setInformation(BeanDtoUtils.convert(information, InformationDto.class));
-        }
         QueryWrapper<Commercial> commercialQueryWrapper = new QueryWrapper<>();
         commercialQueryWrapper.eq("survey_information_id", surveyInformationId);
         Commercial commercial = commercialService.getBaseMapper().selectOne(commercialQueryWrapper);
         if(commercial==null){
             commercial=new   Commercial();
         }
+
+        if(information == null){
+            surveyInfoAllDto.setInformation(new InformationDto());
+        }else {
+            information.setCardFile( null == commercial ?new ArrayList<>() :(CollectionUtil.isNotEmpty(commercial.getIdCardCredit())? commercial.getIdCardCredit():new ArrayList<>()));
+            surveyInfoAllDto.setInformation(BeanDtoUtils.convert(information, InformationDto.class));
+        }
+
         commercial.setApplicant(peasantHousehold.getOwnersName());
         commercial.setIdCard(peasantHousehold.getIdCard());
         commercial.setTelephone(peasantHousehold.getTelephone());
@@ -477,6 +483,25 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
         commercial.setProjectAddressDetail(peasantHousehold.getProjectAddressDetail());
         commercial.setLegalContactTelephone(peasantHousehold.getTelephone());
 
+        List<Object> list = new ArrayList<>();
+        if (null != surveyDetails){
+            if (CollectionUtil.isNotEmpty(surveyDetails.getSurroundingHouseSurvey())){
+                list.addAll(surveyDetails.getSurroundingHouseSurvey());
+            }
+            if (CollectionUtil.isNotEmpty(surveyDetails.getOverallHousingSurvey())){
+                list.addAll(surveyDetails.getOverallHousingSurvey());
+            }
+            if (CollectionUtil.isNotEmpty(surveyDetails.getPanoramaSurvey())){
+                list.addAll(surveyDetails.getPanoramaSurvey());
+            }
+            if (CollectionUtil.isNotEmpty(surveyDetails.getPlanSketchSurvey())){
+                list.addAll(surveyDetails.getPlanSketchSurvey());
+            }
+            if (CollectionUtil.isNotEmpty(surveyDetails.getAzimuthSurvey())){
+                list.addAll(surveyDetails.getAzimuthSurvey());
+            }
+        }
+        commercial.setSurveyPhotosWeb(list);
 
 
         if(information == null){