Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev

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;
+}
+

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;
+}
+

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<PageData<SubUserHouseListResultDTO>>().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<PageData<GroupRentHouseResultDTO>> groupRentHouseList(@LoginUser TokenDto tokenDto, @RequestBody GroupRentHouseFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
+        return new Result<PageData<GroupRentHouseResultDTO>>().ok(houseService.groupRentHouseList(formDTO));
+    }
+
+
+
 }

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<IcHouseEntity> {
     List<IcHouseListResultDTO> houseStatisListDetail(HouseChartFormDTO formDTO);
 
     List<IcHouseEntity> selectListForRenFangStats(@Param("buildingId") String buildingId);
+
+    /**
+     * 群租房列表
+     * 群租房：出租状态并超过5人（≥5）
+     * @param formDTO
+     * @return
+     */
+    List<GroupRentHouseResultDTO> selectGroupRentHouseList(GroupRentHouseFormDTO formDTO);
 }

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

@@ -204,4 +204,11 @@ public interface HouseService {
     PageData<IcHouseListResultDTO> houseStatisListDetail(HouseChartFormDTO formDTO);
 
     PageData<SubUserHouseListResultDTO> usingCommunityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize);
+
+    /**
+     * 群租房列表来源于烟台需求
+     * @param formDTO
+     * @return
+     */
+    PageData<GroupRentHouseResultDTO> groupRentHouseList(GroupRentHouseFormDTO formDTO);
 }

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<GroupRentHouseResultDTO> 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<GroupRentHouseResultDTO> list=icHouseDao.selectGroupRentHouseList(formDTO);
+        list.forEach(item -> {
+            item.setHouseType(HouseTypeEnums.getTypeValue(item.getHouseTypeKey()));
+            item.setPurpose(HousePurposeEnums.getTypeValue(item.getPurposeKey()));
+        });
+        PageInfo<GroupRentHouseResultDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal());
+    }
 }

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)
     </select>
+
+    <select id="selectGroupRentHouseList" parameterType="com.epmet.dto.form.GroupRentHouseFormDTO" resultType="com.epmet.dto.result.GroupRentHouseResultDTO">
+        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,
+            (
+                CASE
+
+                    WHEN ih.RENT_FLAG = '0' THEN
+                        '自住'
+                    WHEN ih.RENT_FLAG = '1' THEN
+                        '出租'
+                    WHEN ih.RENT_FLAG = '2' THEN
+                        '闲置'
+                    WHEN ih.RENT_FLAG = '3' THEN
+                        '未出售' ELSE ''
+                    END
+                ) AS rentFlag,
+            CAST( ih.RENT_FLAG AS CHAR ) AS rentFlagKey,
+            ih.OWNER_NAME ownerName,
+            ih.OWNER_PHONE ownerPhone,
+            ih.OWNER_ID_CARD ownerIdCard,
+            IFNULL( ih.REMARK, '' ) AS remark,
+            IFNULL( ih.sort, 0 ) AS sort
+        FROM
+            ic_house ih
+                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'
+                AND n.DEL_FLAG = '0'
+                AND bu.DEL_FLAG = '0'
+                AND ih.customer_id = #{customerId}
+            and ih.RESI_NUMBER &gt;= 5
+            and ih.RENT_FLAG = '1'
+        <choose>
+            <when test='orgType == "agency"'>
+                AND (n.AGENCY_ID = #{orgId} OR n.AGENCY_PIDS LIKE concat( '%', #{orgId}, '%' )  )
+            </when>
+            <otherwise>
+                AND n.GRID_ID = #{orgId}
+            </otherwise>
+        </choose>
+        <if test='null != ownerName and ownerName != "" '>
+            AND ih.OWNER_NAME LIKE concat( '%', #{ownerName}, '%' )
+        </if>
+        <if test='null != ownerPhone and ownerPhone != "" '>
+            AND ih.OWNER_PHONE LIKE concat( '%', #{ownerPhone}, '%' )
+        </if>
+        <if test='null != purpose and purpose != "" '>
+            AND ih.PURPOSE = #{purpose}
+        </if>
+        <if test='null != remark and remark != "" '>
+            AND ih.REMARK LIKE concat( '%', #{remark}, '%' )
+        </if>
+        ORDER BY
+            CONVERT ( n.NEIGHBOR_HOOD_NAME USING gbk ),
+            CONVERT ( ib.BUILDING_NAME USING gbk ),
+            CONVERT ( bu.UNIT_NAME USING gbk ),
+            CAST( ih.DOOR_NAME AS SIGNED ),
+            CONVERT ( ih.DOOR_NAME USING gbk ),
+            ih.SORT ASC
+    </select>
 </mapper>

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<java.util.List < com.epmet.dto.result.HomeUserBriefResultDTO>>
+     * @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<List<HomeUserBriefResultDTO>> listHomeUserBriefEncrypt(@PathVariable("houseId") String houseId, @LoginUser TokenDto loginUser) {
+        String customerId = loginUser.getCustomerId();
+        List<HomeUserBriefResultDTO> r = icResiUserService.listHomeUserBrief(houseId, customerId);
+        return new Result().ok(r);
+    }
+
+
     /**
      * 根据房屋id,查询居民信息表中-家庭信息-本人  的居民。如果有多个，返回最近一个
      *