bug 修复

linwei

2024-01-19 494aeb58eb885b40ab2fdb083aaa79007bb79ae2

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

@@ -16,13 +16,17 @@
 */
package org.springblade.modules.house.mapper;

import org.apache.ibatis.annotations.Param;
import org.springblade.common.node.TreeNode;
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.vo.HouseholdVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.common.node.TreeStringNode;
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.excel.HouseHoldExcel;
import org.springblade.modules.house.vo.HouseholdOtherVO;
import org.springblade.modules.house.vo.HouseholdVO;

import java.util.List;
import java.util.Map;

/**
 * 住户 Mapper 接口
@@ -39,7 +43,17 @@
    * @param household
    * @return
    */
   List<HouseholdVO> selectHouseholdPage(IPage page, HouseholdVO household);
   List<HouseholdVO> selectHouseholdPage(IPage page,
                                @Param("household") HouseholdVO household,
                                @Param("regionChildCodesList") List<String> regionChildCodesList,
                                @Param("isAdministrator") Integer isAdministrator);

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


   /**
@@ -47,5 +61,76 @@
    * @param userId
    * @return
    */
    List<TreeNode> selectHouseNodeList(@Param("userId") Long userId);
    List<TreeStringNode> selectHouseNodeList(@Param("userId") Long userId);

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

   /**
    * 住户 自定义查询详情
    * @param household
    * @return
    */
   HouseholdVO getHouseholdListById(@Param("household") HouseholdEntity household);

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

   Integer statistics(Long userId,String neiCode);

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

   /**
    * 查询网格
    * @param household
    * @return
    */
   HouseholdOtherVO getGrid(@Param("household") HouseholdVO household);

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

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

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

   /**
    * 查询所有未入库的业主信息
    * @return
    */
   List<HouseholdEntity> getNotInsertUserHousehold();

   /**
    * 住户列表查询
    *
    * @param household
    * @return
    */
   List<HouseholdVO> selectHouseholdList(@Param("household") HouseholdVO household);

   List<HouseholdVO> getKeynotePersonnelPage(IPage<HouseholdVO> page, @Param("household") HouseholdVO household);

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