feat: 房源

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/vo/AssociationBusinessEntityHouseResourceDto.java

-package com.ruoyi.system.domain.house.vo;
-
-import com.ruoyi.system.domain.house.BusinessEntitySell;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class AssociationBusinessEntityHouseResourceDto {
-
-    private String id;
-
-    private String houseResourceId;
-
-    private String name;
-
-    private String nature;
-
-    private String socialCreditCode;
-
-    private String principal;
-
-    private String principalTel;
-
-    private String business;
-
-    private Integer workerNumber;
-
-    private String registeredAddress;
-
-    private String industryClassification;
-
-    private Boolean gs;
-
-    private Boolean registrationPlaceFlag;
-
-    private boolean associationBusinessEntityFlag;
-
-    private List<HouseResourcePage> houseResources;
-
-    private List<BusinessEntitySell> businessEntitySells;
-}

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/vo/BusinessEntityDto.java

@@ -32,9 +32,11 @@ public class BusinessEntityDto {
 
     private Boolean gs;
 
-    private List<BusinessEntitySell> businessEntitySells;
-
     private Boolean registrationPlaceFlag;
 
     private boolean associationBusinessEntityFlag;
+
+    private List<HouseResourcePage> houseResources;
+
+    private List<BusinessEntitySell> businessEntitySells;
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/vo/HouseResourceDetail.java

@@ -100,7 +100,7 @@ public class HouseResourceDetail {
 
     private String remark;
 
-    private List<AssociationBusinessEntityHouseResourceDto> businessEntityDtoList;
+    private List<BusinessEntityDto> businessEntityDtoList;
 
     private Integer registrationPlaceFlag;
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/house/HouseResourceService.java

@@ -34,5 +34,5 @@ public interface HouseResourceService {
 
     void saveYearTax(YearTaxSaveUpdateDto dto);
 
-    List<AssociationBusinessEntityHouseResourceDto> listByBusinessEntityInfoName(String name);
+    List<BusinessEntityDto> listByBusinessEntityInfoName(String name);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/house/impl/HouseResourceServiceImpl.java

@@ -133,24 +133,24 @@ public class HouseResourceServiceImpl implements HouseResourceService {
 
         List<HouseResourceBusinessEntityInfoMapping> houseResourceMappings = houseResourceBusinessEntityInfoMappingMapper.selectByHouseResourceId(id);
         if (!CollectionUtils.isEmpty(houseResourceMappings)) {
-            List<AssociationBusinessEntityHouseResourceDto> result = new ArrayList<>();
+            List<BusinessEntityDto> result = new ArrayList<>();
             List<BusinessEntityInfo> businessEntityInfos = businessEntityInfoMapper.selectByIdList(houseResourceMappings.stream().map(HouseResourceBusinessEntityInfoMapping::getBusinessEntityInfoId).collect(Collectors.toList()));
             businessEntityInfos.forEach(x -> {
-                AssociationBusinessEntityHouseResourceDto associationBusinessEntityHouseResourceDto = new AssociationBusinessEntityHouseResourceDto();
-                BeanUtils.copyProperties(x, associationBusinessEntityHouseResourceDto);
+                BusinessEntityDto businessEntityDto = new BusinessEntityDto();
+                BeanUtils.copyProperties(x, businessEntityDto);
                 if (StringUtils.hasText(x.getHouseResourceId())) {
                     List<HouseResourceBusinessEntityInfoMapping> businessEntityInfoMappings = houseResourceBusinessEntityInfoMappingMapper.selectByBusinessEntityInfoId(x.getId());
                     if (!CollectionUtils.isEmpty(businessEntityInfoMappings)) {
                         List<HouseResourcePage> list = houseResourceMapper.selectByIdList(businessEntityInfoMappings.stream().map(HouseResourceBusinessEntityInfoMapping::getHouseResourceId).collect(Collectors.toList()));
                         List<HouseResourcePage> handleList = handleHouseList(list, false);
-                        associationBusinessEntityHouseResourceDto.setHouseResources(handleList);
+                        businessEntityDto.setHouseResources(handleList);
                     }
                 }
                 List<BusinessEntitySell> businessEntitySells = businessEntitySellMapper.selectBusinessEntitySellByEntityId(x.getId());
                 if (!CollectionUtils.isEmpty(businessEntitySells)) {
-                    associationBusinessEntityHouseResourceDto.setBusinessEntitySells(businessEntitySells);
+                    businessEntityDto.setBusinessEntitySells(businessEntitySells);
                 }
-                result.add(associationBusinessEntityHouseResourceDto);
+                result.add(businessEntityDto);
             });
             houseResourceDetail.setBusinessEntityDtoList(result);
         }
@@ -508,28 +508,28 @@ public class HouseResourceServiceImpl implements HouseResourceService {
     }
 
     @Override
-    public List<AssociationBusinessEntityHouseResourceDto> listByBusinessEntityInfoName(String name) {
+    public List<BusinessEntityDto> listByBusinessEntityInfoName(String name) {
         List<BusinessEntityInfo> businessEntityInfos = businessEntityInfoMapper.selectByName(name);
         if (CollectionUtils.isEmpty(businessEntityInfos)) {
             return Collections.emptyList();
         }
-        List<AssociationBusinessEntityHouseResourceDto> result = new ArrayList<>();
+        List<BusinessEntityDto> result = new ArrayList<>();
         businessEntityInfos.forEach(x -> {
-            AssociationBusinessEntityHouseResourceDto associationBusinessEntityHouseResourceDto = new AssociationBusinessEntityHouseResourceDto();
-            BeanUtils.copyProperties(x, associationBusinessEntityHouseResourceDto);
+            BusinessEntityDto businessEntityDto = new BusinessEntityDto();
+            BeanUtils.copyProperties(x, businessEntityDto);
             if (StringUtils.hasText(x.getHouseResourceId())) {
                 List<HouseResourceBusinessEntityInfoMapping> houseResourceBusinessEntityInfoMappings = houseResourceBusinessEntityInfoMappingMapper.selectByBusinessEntityInfoId(x.getId());
                 if (!CollectionUtils.isEmpty(houseResourceBusinessEntityInfoMappings)) {
                     List<HouseResourcePage> list = houseResourceMapper.selectByIdList(houseResourceBusinessEntityInfoMappings.stream().map(HouseResourceBusinessEntityInfoMapping::getHouseResourceId).collect(Collectors.toList()));
                     List<HouseResourcePage> handleList = handleHouseList(list, false);
-                    associationBusinessEntityHouseResourceDto.setHouseResources(handleList);
+                    businessEntityDto.setHouseResources(handleList);
                 }
             }
             List<BusinessEntitySell> businessEntitySells = businessEntitySellMapper.selectBusinessEntitySellByEntityId(x.getId());
             if (!CollectionUtils.isEmpty(businessEntitySells)) {
-                associationBusinessEntityHouseResourceDto.setBusinessEntitySells(businessEntitySells);
+                businessEntityDto.setBusinessEntitySells(businessEntitySells);
             }
-            result.add(associationBusinessEntityHouseResourceDto);
+            result.add(businessEntityDto);
         });
         return result ;
     }