diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GroupRentHouseResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GroupRentHouseResultDTO.java new file mode 100644 index 0000000000..febcd6e4fc --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GroupRentHouseResultDTO.java @@ -0,0 +1,77 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 群租房列表 + * @Author yzm + * @Date 2023/3/3 9:27 + */ +@Data +public class GroupRentHouseResultDTO implements Serializable { + private static final long serialVersionUID = 3671964765109154117L; + private String houseId; + + /** + * 所属组织 + */ + private String agencyName; + private String agencyId; + /** + * 所属网格 + */ + private String gridName; + private String gridId; + + /** + * 所属小区 + */ + private String neighborHoodName; + /** + * 所属楼栋 + */ + private String buildingName; + + private String houseName; + /** + * 房屋类型 + */ + private String houseType; + private String houseTypeKey; + /** + * 房屋用途 + */ + private String purpose; + private String purposeKey; + + /** + * 房屋状态:房屋状态:1:出租 0:自住 2:闲置 3:未售出 + */ + private String rentFlag; + + /** + * 房主姓名 + */ + private String ownerName; + /** + * 房主电话 + */ + private String ownerPhone; + /** + * 房主身份证 + */ + private String ownerIdCard; + + /** + * 备注 + */ + private String remark; + + /** + * 排序 + */ + private Double sort; +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index f028d098d2..32062f26c5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -700,10 +700,10 @@ public class HouseController implements ResultDataResolver { @PostMapping("group-rent-house-list") @MaskResponse(fieldNames = {"ownerIdCard", "ownerPhone"}, fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD, MaskResponse.MASK_TYPE_MOBILE}) - public Result> groupRentHouseList(@LoginUser TokenDto tokenDto, @RequestBody GroupRentHouseFormDTO formDTO) { + public Result> groupRentHouseList(@LoginUser TokenDto tokenDto, @RequestBody GroupRentHouseFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); - return new Result>().ok(houseService.groupRentHouseList(formDTO)); + return new Result>().ok(houseService.groupRentHouseList(formDTO)); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index 699b91362e..3e9d28b39f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -217,5 +217,5 @@ public interface IcHouseDao extends BaseDao { * @param formDTO * @return */ - List selectGroupRentHouseList(GroupRentHouseFormDTO formDTO); + List selectGroupRentHouseList(GroupRentHouseFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index 61288d60cd..8499b55722 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -210,5 +210,5 @@ public interface HouseService { * @param formDTO * @return */ - PageData groupRentHouseList(GroupRentHouseFormDTO formDTO); + PageData groupRentHouseList(GroupRentHouseFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 8453ec895d..d31ecc0c13 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -1493,7 +1493,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { * @return */ @Override - public PageData groupRentHouseList(GroupRentHouseFormDTO formDTO) { + public PageData groupRentHouseList(GroupRentHouseFormDTO formDTO) { if(StringUtils.isBlank(formDTO.getOrgId())){ //默认查询当前组织及下级 formDTO.setOrgType("agency"); @@ -1502,8 +1502,12 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { } //群租房:出租状态并超过5人(≥5) PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize()); - List list=icHouseDao.selectGroupRentHouseList(formDTO); - PageInfo pageInfo = new PageInfo<>(list); + List list=icHouseDao.selectGroupRentHouseList(formDTO); + list.forEach(item -> { + item.setHouseType(HouseTypeEnums.getTypeValue(item.getHouseTypeKey())); + item.setPurpose(HousePurposeEnums.getTypeValue(item.getPurposeKey())); + }); + PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index acc3dcc874..222062704a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -702,10 +702,16 @@ CONVERT(a.DOOR_NAME using gbk) - SELECT ih.ID AS houseId, + n.AGENCY_ID as agencyId, + ca.ORGANIZATION_NAME as agencyName, + n.GRID_ID as gridId, + cg.GRID_NAME as gridName, concat( n.NEIGHBOR_HOOD_NAME, ib.BUILDING_NAME, bu.UNIT_NAME, ih.DOOR_NAME ) AS houseName, + n.NEIGHBOR_HOOD_NAME as neighborHoodName, + ib.BUILDING_NAME as buildingName, ih.HOUSE_TYPE AS houseTypeKey, ih.PURPOSE AS purposeKey, ( @@ -732,6 +738,8 @@ LEFT JOIN ic_building ib ON ( ih.BUILDING_ID = ib.id ) LEFT JOIN ic_neighbor_hood n ON ( ib.NEIGHBOR_HOOD_ID = n.ID ) LEFT JOIN ic_building_unit bu ON ( ih.BUILDING_UNIT_ID = bu.id ) + left join customer_agency ca on(n.AGENCY_ID=ca.id) + left join customer_grid cg on(n.grid_id=cg.id) WHERE ih.DEL_FLAG = '0' AND ib.DEL_FLAG = '0'