diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GroupRentHouseFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GroupRentHouseFormDTO.java new file mode 100644 index 0000000000..97c8832968 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GroupRentHouseFormDTO.java @@ -0,0 +1,48 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2023/3/2 17:35 + */ +@Data +public class GroupRentHouseFormDTO extends PageFormDTO implements Serializable { + private static final long serialVersionUID = -953729855530434972L; + /** + * 组织ID + */ + private String orgId; + private String orgType; + + /** + * 房主姓名 + */ + private String ownerName; + /** + * 房主电话 + */ + private String ownerPhone; + + /** + * 房屋用途 + */ + private String purpose; + + /** + * 备注 + */ + private String remark; + + + /** + * tokenDto获取 + */ + private String customerId; + private String staffId; +} + 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 53738a3d4c..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 @@ -691,4 +691,21 @@ public class HouseController implements ResultDataResolver { return new Result>().ok(r); } + /** + * 群租房列表来源于烟台需求 + * @param tokenDto + * @param formDTO + * @return + */ + @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) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + 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 1f3ceacfe5..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 @@ -2,10 +2,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.ImportGeneralDTO; -import com.epmet.dto.form.CheckHouseInfoFormDTO; -import com.epmet.dto.form.GetHouseInfoToCollectFormDTO; -import com.epmet.dto.form.HouseChartFormDTO; -import com.epmet.dto.form.IcHouseListFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.CustomerOrgParameterEntity; import com.epmet.entity.IcHouseEntity; @@ -213,4 +210,12 @@ public interface IcHouseDao extends BaseDao { List houseStatisListDetail(HouseChartFormDTO formDTO); List selectListForRenFangStats(@Param("buildingId") String buildingId); + + /** + * 群租房列表 + * 群租房:出租状态并超过5人(≥5) + * @param formDTO + * @return + */ + 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 1161a1ee9f..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 @@ -204,4 +204,11 @@ public interface HouseService { PageData houseStatisListDetail(HouseChartFormDTO formDTO); PageData usingCommunityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize); + + /** + * 群租房列表来源于烟台需求 + * @param formDTO + * @return + */ + 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 d7e3b1f8b2..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 @@ -1484,4 +1484,30 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { agencyNamePathList.add(agencyInfo.getOrganizationName()); return String.join("-", agencyNamePathList); } + + + /** + * 群租房列表来源于烟台需求 + * + * @param formDTO + * @return + */ + @Override + public PageData groupRentHouseList(GroupRentHouseFormDTO formDTO) { + if(StringUtils.isBlank(formDTO.getOrgId())){ + //默认查询当前组织及下级 + formDTO.setOrgType("agency"); + CustomerStaffInfoCacheResult staffInfoCacheResult=CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(),formDTO.getStaffId()); + formDTO.setOrgId(staffInfoCacheResult.getAgencyId()); + } + //群租房:出租状态并超过5人(≥5) + PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize()); + 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 6eac8ed9fd..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 @@ -701,4 +701,79 @@ CAST(a.DOOR_NAME AS SIGNED), CONVERT(a.DOOR_NAME using gbk) + + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 440a440fd4..407eb3c26c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -1217,6 +1217,25 @@ public class IcResiUserController implements ResultDataResolver { return new Result().ok(r); } + /** + * 根据房屋主键查询户内家庭成员简信息 + * 返回的手机号、身份证加密 + * + * @param houseId 房屋主键 + * @param loginUser 登录用户 + * @return com.epmet.commons.tools.utils.Result> + * @author work@yujt.net.cn + * @date 2022/4/21/0021 15:00 + */ + @MaskResponse(fieldNames = {"mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE,MaskResponse.MASK_TYPE_ID_CARD}) + @PostMapping("listhomeuserbrief-encrypt/{houseId}") + public Result> listHomeUserBriefEncrypt(@PathVariable("houseId") String houseId, @LoginUser TokenDto loginUser) { + String customerId = loginUser.getCustomerId(); + List r = icResiUserService.listHomeUserBrief(houseId, customerId); + return new Result().ok(r); + } + + /** * 根据房屋id,查询居民信息表中-家庭信息-本人 的居民。如果有多个,返回最近一个 *