拿不到地址总表数据，不设置网格信息

linwei

2024-01-31 b3b566ebdfed4005aaa513da3d5d2fd3924903cc

 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java

@@ -18,7 +18,9 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
import org.springblade.common.node.TreeIntegerNode;
import org.springblade.common.node.TreeStringNode;
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.excel.HouseHoldExcel;
@@ -50,28 +52,32 @@

   /**
    * 获取全部
    *
    * @param household
    * @return
    */
   List<HouseholdVO> getAllHouseHold(@Param("household")HouseholdVO household);
   List<HouseholdVO> getAllHouseHold(@Param("household") HouseholdVO household);


   /**
    * 查询房屋集合信息
    *
    * @param userId
    * @return
    */
    List<TreeStringNode> selectHouseNodeList(@Param("userId") Long userId);
   List<TreeStringNode> selectHouseNodeList(@Param("userId") Long userId);

   /**
    * 查询房屋人员情况
    *
    * @param code
    * @return
    */
    List<HouseholdVO> getHouseholdListByCode(@Param("code") String code);
   List<HouseholdVO> getHouseholdListByCode(@Param("code") String code);

   /**
    * 住户 自定义查询详情
    *
    * @param household
    * @return
    */
@@ -79,22 +85,25 @@

   /**
    * 导出
    *
    * @param household
    * @return
    */
   List<HouseHoldExcel> export(@Param("household") HouseholdVO household);

   Integer statistics(Long userId,String neiCode);
   Integer statistics(Long userId, String neiCode);

   /**
    * 查询物业
    *
    * @param household
    * @return
    */
    HouseholdOtherVO getProperty(@Param("household") HouseholdVO household);
   HouseholdOtherVO getProperty(@Param("household") HouseholdVO household);

   /**
    * 查询网格
    *
    * @param household
    * @return
    */
@@ -102,17 +111,19 @@

   /**
    * 查询公安信息
    *
    * @param household
    * @return
    */
   HouseholdOtherVO getSecurity(@Param("household") HouseholdVO household);

    List<Map<String, Object>> getHouseHoldStatistics(String code, Long userId,String roleType);
   List<Map<String, Object>> getHouseHoldStatistics(String code, Long userId, String roleType);

   List<Map<String, Object>>  getHouseHoldStatisticsAge(String code, Long userId,String roleType);
   List<Map<String, Object>> getHouseHoldStatisticsAge(String code, Long userId, String roleType);

   /**
    * 查询所有未入库的业主信息
    *
    * @return
    */
   List<HouseholdEntity> getNotInsertUserHousehold();
@@ -129,8 +140,12 @@

   /**
    * 根据人员标签编号集合查询对应的住户（按颜色区分近多少天没有发过任务的住户）
    *
    * @param list
    * @return
    */
   List<HouseholdVO> getHouseholdListByParam(@Param("list") List<Integer> list);

   @MapKey(value = "id")
   Map<Integer, TreeIntegerNode> getlabelStatistics(@Param("household") HouseholdVO household);
}