修改字段

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

@@ -615,20 +615,15 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
         }else {
             surveyInfoAllDto.setSurveyDetails(BeanDtoUtils.convert(surveyDetails, SurveyDetailsDto.class));
         }
-        QueryWrapper<Information> informationQueryWrapper = new QueryWrapper<>();
-        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();
         }
+
         commercial.setApplicant(peasantHousehold.getOwnersName());
         commercial.setIdCard(peasantHousehold.getIdCard());
         commercial.setTelephone(peasantHousehold.getTelephone());
@@ -636,6 +631,20 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
         commercial.setProjectAddressName(peasantHousehold.getProjectAddressName());
         commercial.setProjectAddressDetail(peasantHousehold.getProjectAddressDetail());
         commercial.setLegalContactTelephone(peasantHousehold.getTelephone());
+
+//        资料归档
+        QueryWrapper<Information> informationQueryWrapper = new QueryWrapper<>();
+        informationQueryWrapper.eq("survey_information_id", surveyInformationId);
+        Information information = informationService.getBaseMapper().selectOne(informationQueryWrapper);
+        if(information == null){
+            surveyInfoAllDto.setInformation(new InformationDto());
+        }else {
+            // 将商务信息的房产证明文件数据赋值给资料归档的房产证明文件
+            information.setCardFile(commercial.getRealEstateLegal());
+            surveyInfoAllDto.setInformation(BeanDtoUtils.convert(information, InformationDto.class));
+        }
+
+
         if(information == null){
             CommercialDto commercialDto = BeanDtoUtils.convert(commercial, CommercialDto.class);
             commercialDto.setType("zrr");