Merge branch 'yantai_zhengwu_master' into dev

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseCountPictureFormDTO.java

@@ -20,6 +20,9 @@ public class HouseCountPictureFormDTO implements Serializable {
 
     private Date timeEnd;
 
+    private String purpose;
+
+    private Integer rentFlag;
 
     private Integer pageSize;
 

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HousePictureListResultDTO.java

@@ -21,13 +21,17 @@ public class HousePictureListResultDTO implements Serializable {
 
     private String districtName;
 
-    private String neighborName;
+    private String streetName;
+
+    private String communityName;
 
     private String gridName;
 
     private String houseName;
 
-    private String purpose;
+    private String purposeName;
+
+    private String rentFlagName;
 
-    private Integer rentFlag;
+    private String orgIdPath;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java

@@ -186,9 +186,11 @@ public class IcHouseController {
     }
 
     /**
-     * 房屋画像-列表
+     * @Description: 房屋画像-列表
-     * @param dto
+     * @param dto:
-     * @return
+     * @Return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData < com.epmet.dto.result.HousePictureListResultDTO>>
+     * @Author: lichao
+     * @Date: 2023/4/11 16:20
      */
     @PostMapping("getHousePictureList")
     public Result<PageData<HousePictureListResultDTO>> getHousePictureList(@RequestBody HouseCountPictureFormDTO dto){

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java

@@ -224,5 +224,5 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
 
     List<HouseCountPictureListResultDTO> getHouseStatusCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd);
 
-    List<HousePictureListResultDTO> getHousePictureList(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd);
+    List<HousePictureListResultDTO> getHousePictureList(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd,@Param("purpose") String purpose,@Param("rentFlag") Integer rentFlag);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java

@@ -15,10 +15,7 @@ import com.epmet.commons.tools.redis.common.bean.HouseInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dao.IcBuildingDao;
+import com.epmet.dao.*;
-import com.epmet.dao.IcBuildingUnitDao;
-import com.epmet.dao.IcHouseDao;
-import com.epmet.dao.IcNeighborHoodDao;
 import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.IcResiCategoryStatsConfigDTO;
 import com.epmet.dto.IcResiUserDTO;
@@ -28,10 +25,7 @@ import com.epmet.dto.form.HouseCountPictureFormDTO;
 import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.dto.region.LogOperationResultDTO;
 import com.epmet.dto.result.*;
-import com.epmet.entity.IcBuildingEntity;
+import com.epmet.entity.*;
-import com.epmet.entity.IcBuildingUnitEntity;
-import com.epmet.entity.IcHouseEntity;
-import com.epmet.entity.IcNeighborHoodEntity;
 import com.epmet.enums.HousePurposeEnums;
 import com.epmet.enums.HouseRentFlagEnums;
 import com.epmet.enums.HouseTypeEnums;
@@ -39,12 +33,14 @@ import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.redis.IcHouseRedis;
+import com.epmet.service.CustomerAgencyService;
 import com.epmet.service.IcHouseService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.record.PageBreakRecord;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -78,6 +74,10 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
     private IcBuildingUnitDao buildingUnitDao;
     @Autowired
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+    @Autowired
+    private CustomerAgencyDao customerAgencyDao;
+    @Autowired
+    private CustomerGridDao customerGridDao;
 
     @Override
     public IcHouseDTO get(String id) {
@@ -447,7 +447,23 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
     public PageData<HousePictureListResultDTO> getHousePictureList(HouseCountPictureFormDTO dto) {
         // 列表/导出查询
         PageHelper.startPage(dto.getPageNo(), dto.getPageSize());
-        List<HousePictureListResultDTO> list = baseDao.getHousePictureList(dto.getOrgIdPath(),dto.getTimeStart(),dto.getTimeEnd());
+        List<HousePictureListResultDTO> list = baseDao.getHousePictureList(dto.getOrgIdPath(),dto.getTimeStart(),dto.getTimeEnd(),dto.getPurpose(),dto.getRentFlag());
+
+        list.forEach(entity->{
+            String[] agencyIds = entity.getOrgIdPath().split(":");
+            LambdaQueryWrapper<CustomerAgencyEntity> queryWrapperAgency = new LambdaQueryWrapper<CustomerAgencyEntity>().in(CustomerAgencyEntity::getId,agencyIds);
+            List<CustomerAgencyEntity> customerAgencyEntities = customerAgencyDao.selectList(queryWrapperAgency);
+            customerAgencyEntities.forEach(agency->{
+                if (agency.getLevel().equals("district")){
+                    entity.setDistrictName(agency.getOrganizationName());
+                }else if (agency.getLevel().equals("street")){
+                    entity.setStreetName(agency.getOrganizationName());
+                }else if (agency.getLevel().equals("community")){
+                    entity.setCommunityName(agency.getOrganizationName());
+                }
+            });
+        });
+
         PageInfo<HousePictureListResultDTO> pageInfo = new PageInfo<>(list);
 
         return new PageData<>(list,pageInfo.getTotal());

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -806,5 +806,33 @@
         </if>
         group by RENT_FLAG
     </select>
-    <select id="getHousePictureList" resultType="com.epmet.dto.result.HousePictureListResultDTO"></select>
+    <select id="getHousePictureList" resultType="com.epmet.dto.result.HousePictureListResultDTO">
+
+        select house.ID as houseId,ORG_ID_PATH as orgIdPath,FULL_NAME as houseName,grid.GRID_NAME as gridName,
+            IF(house.RENT_FLAG=1,'出租',IF(house.RENT_FLAG=2,'闲置',IF(house.RENT_FLAG=3,'未售出','自住'))) as rentFlagName,
+        IF(house.PURPOSE = 1,'住宅',IF(house.PURPOSE = 2,'商业',IF(house.PURPOSE = 3,'办公',IF(house.PURPOSE = 4,'工业',IF(house.PURPOSE = 5,'存储',IF(house.PURPOSE = 6,'商用混用','其它')))))) as purposeName
+        from ic_house house
+            left join ic_neighbor_hood hood on house.NEIGHBOR_HOOD_ID = hood.id
+            left join customer_grid grid on grid.id = hood.GRID_ID
+
+        where house.DEL_FLAG = '0'
+            and
+            ORG_ID_PATH like concat(#{orgId},'%')
+        <if test="timeStart != null">
+            and CREATED_TIME &gt;= #{timeStart}
+        </if>
+        <if test="timeEnd != null">
+            and CREATED_TIME &lt;= #{timeEnd}
+        </if>
+        <if test="purpose != null and purpose != ''">
+            and PURPOSE = #{purpose}
+        </if>
+        <if test="rentFlag != null and rentFlag != ''">
+            and RENT_FLAG = #{rentFlag}
+        </if>
+
+
+
+
+    </select>
 </mapper>