From 323f73025526fbf5b278ce15aec2dc5ab1168c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=98=89=E5=A4=9A=E5=AE=9D=E5=AE=9D?= Date: Thu, 15 Jan 2026 16:48:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AB=AF=E8=8E=B7=E5=8F=96=E6=B4=BB=E5=8A=A8=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=81=94=E7=B3=BB=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/resp/AdminActivityInfoCollectionResp.java | 6 ++++++ .../admin/convert/AdminActivityInfoCollectionConvert.java | 2 ++ .../admin/service/AdminActivityInfoCollectionService.java | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/controller/resp/AdminActivityInfoCollectionResp.java b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/controller/resp/AdminActivityInfoCollectionResp.java index 8bb641c..b5f2925 100644 --- a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/controller/resp/AdminActivityInfoCollectionResp.java +++ b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/controller/resp/AdminActivityInfoCollectionResp.java @@ -55,6 +55,12 @@ public class AdminActivityInfoCollectionResp { @Schema(description = "出生年月") private LocalDate childBirthDate; + /** + * 手机号 + */ + @Schema(description = "手机号") + private String mobile; + /** * 年级 */ diff --git a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/convert/AdminActivityInfoCollectionConvert.java b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/convert/AdminActivityInfoCollectionConvert.java index a4a663d..635ff44 100644 --- a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/convert/AdminActivityInfoCollectionConvert.java +++ b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/convert/AdminActivityInfoCollectionConvert.java @@ -3,6 +3,7 @@ package com.seer.teach.mp.admin.convert; import com.seer.teach.mp.admin.controller.resp.AdminActivityInfoCollectionResp; import com.seer.teach.mp.entity.MpActivityInfoCollectionEntity; import org.mapstruct.Mapper; +import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; import java.util.List; @@ -12,6 +13,7 @@ public interface AdminActivityInfoCollectionConvert { AdminActivityInfoCollectionConvert INSTANCE = Mappers.getMapper(AdminActivityInfoCollectionConvert.class); + @Mapping(source = "mobile", target = "mobile") AdminActivityInfoCollectionResp convertToResp(MpActivityInfoCollectionEntity entity); List convertToRespList(List entity); diff --git a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/AdminActivityInfoCollectionService.java b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/AdminActivityInfoCollectionService.java index b8673d7..4e3613c 100644 --- a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/AdminActivityInfoCollectionService.java +++ b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/AdminActivityInfoCollectionService.java @@ -43,6 +43,7 @@ public class AdminActivityInfoCollectionService { /** * 获取活动信息收集记录详情 + * * @param id 记录ID * @return 详情 */ @@ -53,6 +54,7 @@ public class AdminActivityInfoCollectionService { /** * 删除活动信息收集记录 + * * @param ids 删除的ID列表 * @return 删除结果 */ @@ -66,7 +68,7 @@ public class AdminActivityInfoCollectionService { * @param activityId 活动Id * @return 返回活动列表 */ - public PageListBean list(ActivityInfoCollectionQueryReq req ,Integer activityId) { + public PageListBean list(ActivityInfoCollectionQueryReq req, Integer activityId) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(MpActivityInfoCollectionEntity::getActivityId, activityId) .like(Objects.nonNull(req.getChildName()) && !req.getChildName().isEmpty(), MpActivityInfoCollectionEntity::getChildName, req.getChildName())