Эх сурвалжийг харах

站点列表增加批量stationIdList查询

zuypeng 11 сар өмнө
parent
commit
90818e7e83

+ 3 - 0
entity/src/main/java/com/kym/entity/admin/queryParams/StationQueryParam.java

@@ -3,11 +3,14 @@ package com.kym.entity.admin.queryParams;
 import com.kym.entity.common.PageParams;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 站点查询参数
  */
 @Data
 public class StationQueryParam extends PageParams {
+    private List<String> stationIdList;
     private String stationId;
     private String stationName;
 

+ 7 - 0
service/src/main/java/com/kym/service/admin/impl/StationServiceImpl.java

@@ -79,11 +79,17 @@ public class StationServiceImpl extends MyBaseServiceImpl<StationMapper, Station
         var adminStationIds = KymCache.INSTANCE.getAdminUserStationIds(StpUtil.getLoginIdAsLong());
         QueryWrapper<Station> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("station_status", Station.STATION_STATUS_正常使用);
+
+
         if (CommUtil.isNotEmptyAndNull(params.getStationId())) {
             Set<String> stationIdSets = new java.util.HashSet<>(Set.of(params.getStationId()));
             stationIdSets.addAll(adminStationIds);
             queryWrapper.in("station_id", stationIdSets);
         }
+        if (CommUtil.isNotEmptyAndNull(params.getStationIdList())) {
+            queryWrapper.in("station_id", params.getStationIdList());
+        }
+
         if (CommUtil.isNotEmptyAndNull(adminStationIds)) {
             queryWrapper.in("station_id", adminStationIds);
         }
@@ -192,6 +198,7 @@ public class StationServiceImpl extends MyBaseServiceImpl<StationMapper, Station
         LambdaQueryWrapper<Station> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.select(Station::getStationId, Station::getStationName, Station::getAddress, Station::getLocation,
                 Station::getStationStatus, Station::getParkingNum, Station::getElectricityFee, Station::getServiceFee, Station::getParkFee);
+        queryWrapper.in(CommUtil.isNotEmptyAndNull(params.getStationIdList()),Station::getStationId,params.getStationIdList());
         var stationVoList = new ArrayList<SimpleStationVo>();
         var stationList = list(queryWrapper);
         for (var station : stationList) {