Merge remote-tracking branch 'origin/master'

lin

2024-03-14 c4e2c196aad8af656d94bc47e9f1a80bc504b5d7

 src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java

@@ -64,47 +64,53 @@
    * @return
    */
   List<PlaceVO> selectNinePlacePage(IPage page,
                          @Param("place") PlaceVO place,
                          @Param("gridCodeList") List<String> gridCodeList,
                          @Param("regionChildCodesList") List<String> regionChildCodesList,
                          @Param("isAdministrator") Integer isAdministrator,
                          @Param("nineTypeList") List<String> nineTypeList);
                             @Param("place") PlaceVO place,
                             @Param("gridCodeList") List<String> gridCodeList,
                             @Param("regionChildCodesList") List<String> regionChildCodesList,
                             @Param("isAdministrator") Integer isAdministrator,
                             @Param("nineTypeList") List<String> nineTypeList);


   /**
    * 查询场所集合信息
    *
    * @param userId
    * @return
    */
    List<TreeStringNode> selectPlaceNodeList(@Param("userId") String userId);
   List<TreeStringNode> selectPlaceNodeList(@Param("userId") String userId);

   /**
    * 插入用户标签
    *
    * @param userId
    * @param labelId
    */
   int saveUserLabel(@Param("userId") Long userId,@Param("labelId")  int labelId);
   int saveUserLabel(@Param("userId") Long userId, @Param("labelId") int labelId);

   /**
    * 查询所有的场所（手机号不为空）
    *
    * @return
    */
   List<PlaceVO> getPlaceNotNullPhone();

   /**
    * 查询所有的场所
    *
    * @return
    */
   List<PlaceVO> getAllHistoryPlace();

   /**
    * 更新场所信息
    *
    * @param place
    */
   int updatePlaceEntity(@Param("place") PlaceVO place);

   /**
    *  查询场所详情数据
    * 查询场所详情数据
    *
    * @param place
    * @return
    */
@@ -112,6 +118,7 @@

   /**
    * 判断商超是否导入
    *
    * @param placeExcel
    * @return
    */
@@ -119,45 +126,51 @@

   /**
    * 查询出有用户id 的场所
    *
    * @return
    */
    List<PlaceEntity> getHasUserIdPlaceList();
   List<PlaceEntity> getHasUserIdPlaceList();

   /**
    * 查询所有的场所数据（除去详情表已有的）
    *
    * @return
    */
   List<PlaceEntity> getPlaceListByNoExt();

   /**
    * 商超数据处理
    *
    * @return
    */
   List<PlaceEntity> placeAndRelHandle();

   /**
    * 根据编号集合查询对应的场所（按颜色区分近多少天没有发过任务的场所）4部分数据（三种颜色对应的+从来没有发过的）
    *
    * @param stringList
    * @param tableName
    * @return
    */
    List<PlaceVO> getPlaceListByParam(@Param("list") List<String> stringList,
   List<PlaceVO> getPlaceListByParam(@Param("list") List<String> stringList,
                             @Param("tableName") String tableName);

   List<NinePlaceExcel> export( @Param("place") PlaceVO place,
                         @Param("houseCodeList") List<String> houseCodeList,
                         @Param("regionChildCodesList") List<String> regionChildCodesList,
                         @Param("isAdministrator") Integer isAdministrator,
                         @Param("nineTypeList") List<String> nineTypeList);
   List<NinePlaceExcel> export(@Param("place") PlaceVO place,
                        @Param("houseCodeList") List<String> houseCodeList,
                        @Param("regionChildCodesList") List<String> regionChildCodesList,
                        @Param("isAdministrator") Integer isAdministrator,
                        @Param("nineTypeList") List<String> nineTypeList);

   /**
    * 查询 警务网格为空的数据
    *
    * @return
    */
    List<PlaceEntity> getPlaceNotJwGridCode();
   List<PlaceEntity> getPlaceNotJwGridCode();

   /**
    * 比对两点间的距离是否在1km 范围内(和地址总表位置对比)
    *
    * @param placeVO
    * @return
    */
@@ -165,6 +178,7 @@

   /**
    * 比对两点间的距离是否在1km 范围内 (和采集的位置对比)
    *
    * @param placeVO
    * @return
    */
@@ -172,20 +186,32 @@

   /**
    * 查询 综治网格为空的数据
    *
    * @return
    */
   List<PlaceEntity> getPlaceNotGridCode();

   /**
    * 查询对应未的场所 house_code_binds 为空，source = 1 的
    *
    * @return
    */
   List<PlaceEntity> selectPlaceNotDoorBindList();

   /**
    * 查询绑定的房屋
    *
    * @param houseCodeBinds
    * @return
    */
   List<Map<String,Object>> getHouseBindMap(@Param("houseCodeBinds") String houseCodeBinds);
   List<Map<String, Object>> getHouseBindMap(@Param("houseCodeBinds") String houseCodeBinds);

   /**
    * 企业商超列表查询
    */
   List<PlaceVO> selectMallPage(IPage page,
                         @Param("place") PlaceVO place,
                         @Param("gridCodeList") List<String> gridCodeList,
                         @Param("regionChildCodesList") List<String> regionChildCodesList,
                         @Param("isAdministrator") Integer isAdministrator);
}