Merge remote-tracking branch 'origin/master'

linwei

2024-02-20 e67a8a7477096a295d65afa1c366d2b59f8752fc

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

@@ -19,6 +19,7 @@
import org.apache.ibatis.annotations.Param;
import org.springblade.common.node.TreeStringNode;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.excel.NinePlaceExcel;
import org.springblade.modules.place.excel.PlaceAndRelExcel;
import org.springblade.modules.place.vo.PlaceVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -33,12 +34,34 @@
 */
public interface PlaceMapper extends BaseMapper<PlaceEntity> {


   /**
    * 九小场所档案
    *
    * @param page
    * @param place
    * @param gridCodeList
    * @param regionChildCodesList
    * @param isAdministrator
    * @param isAdministrator
    * @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 page
    * @param place
    * @param houseCodeList
    * @param regionChildCodesList
    * @param isAdministrator
    * @return
    */
   List<PlaceVO> selectPlacePage(IPage page,
@@ -119,4 +142,30 @@
    */
    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);

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

   /**
    * 比对两点间的距离是否在1km 范围内(和地址总表位置对比)
    * @param placeVO
    * @return
    */
   Integer comparisonPosition(@Param("place") PlaceVO placeVO);

   /**
    * 比对两点间的距离是否在1km 范围内 (和采集的位置对比)
    * @param placeVO
    * @return
    */
   Boolean comparisonPositionNotHouseCode(@Param("place") PlaceVO placeVO);
}