From 55684426b1bbf6938913acc210ce99699c8e607f Mon Sep 17 00:00:00 2001 From: attiya <2413103649@qq.com> Date: Thu, 8 May 2025 15:58:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=99=E7=82=B9=E7=B1=BB=E5=9E=8B=E4=B8=AD?= =?UTF-8?q?=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/dto/response/ResEbikeSiteRegionInfoDto.java | 2 ++ .../model/dto/response/ResEbikeSiteRegionPageDto.java | 2 ++ .../service/impl/EbikeSiteRegionServiceImpl.java | 7 +++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSiteRegionInfoDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSiteRegionInfoDto.java index 3075b382..7ca8e333 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSiteRegionInfoDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSiteRegionInfoDto.java @@ -40,6 +40,8 @@ public class ResEbikeSiteRegionInfoDto { */ private Integer siteType; + private String siteTypeName; + /** * 站点级别 */ diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSiteRegionPageDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSiteRegionPageDto.java index 2e8c4d7e..b1943d66 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSiteRegionPageDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSiteRegionPageDto.java @@ -36,6 +36,8 @@ public class ResEbikeSiteRegionPageDto { */ private Integer siteType; + private String siteTypeName; + /** * 站点级别 */ diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java index 5e6009f3..66b84f8e 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java @@ -46,6 +46,7 @@ import static com.cdzy.ebikeoperate.model.pojo.table.EbikePointTableDef.EBIKE_PO import static com.cdzy.ebikeoperate.model.pojo.table.EbikeRegionLevelTableDef.EBIKE_REGION_LEVEL; import static com.cdzy.ebikeoperate.model.pojo.table.EbikeSiteImagesTableDef.EBIKE_SITE_IMAGES; import static com.cdzy.ebikeoperate.model.pojo.table.EbikeSiteRegionTableDef.EBIKE_SITE_REGION; +import static com.cdzy.ebikeoperate.model.pojo.table.EbikeSiteTypeTableDef.EBIKE_SITE_TYPE; import static com.cdzy.ebikeoperate.model.pojo.table.EbikeStaffRegionTableDef.EBIKE_STAFF_REGION; /** @@ -178,8 +179,9 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl pageSite(PageParam pageParam, Long operationRegionId, String zoneId, String siteName) { QueryWrapper queryWrapper = QueryWrapper.create() - .select(EBIKE_SITE_REGION.ALL_COLUMNS, EBIKE_REGION_LEVEL.LEVEL_NAME) + .select(EBIKE_SITE_REGION.ALL_COLUMNS, EBIKE_REGION_LEVEL.LEVEL_NAME,EBIKE_SITE_TYPE.SITE_TYPE_NAME) .leftJoin(EBIKE_OPERATION_REGION).on(EBIKE_OPERATION_REGION.OPERATION_REGION_ID.eq(EBIKE_SITE_REGION.OPERATION_REGION_ID)) .leftJoin(EBIKE_ADMINISTRATION_ZONE).on(EBIKE_ADMINISTRATION_ZONE.ID.eq(EBIKE_OPERATION_REGION.ZONE_ID)) .leftJoin(EBIKE_REGION_LEVEL).on(EBIKE_REGION_LEVEL.LEVEL_VALUE.eq(EBIKE_SITE_REGION.SITE_LEVEL)) + .leftJoin(EBIKE_SITE_TYPE).on(EBIKE_SITE_TYPE.SITE_TYPE_VALUE.eq(EBIKE_SITE_REGION.SITE_LEVEL)) .where(EBIKE_REGION_LEVEL.LEVEL_TYPE.eq(RegionLevelType.SITE)) .where(EBIKE_ADMINISTRATION_ZONE.ID.eq(zoneId, StringUtil.hasText(zoneId))) .where(EBIKE_SITE_REGION.SITE_NAME.like(siteName, StringUtil.hasText(siteName)))