Merge remote-tracking branch 'origin/master'

linwei

2024-01-02 31b6aefacbee9dde61be6afcb7c6dbbf7c6baa7d

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

@@ -74,7 +74,7 @@
    */
   List<HouseHoldExcel> export(@Param("household") HouseholdVO household);

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

   /**
    * 查询物业
@@ -97,7 +97,13 @@
    */
   HouseholdOtherVO getSecurity(@Param("household") HouseholdVO household);

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

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

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