From c1549b1d4c4aae014a672a8d2cb0844f1e921cd6 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Tue, 12 Sep 2023 17:44:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=B4=BB=E5=8A=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issue/controller/IssueController.java | 10 ++- .../activity/result/ScreenActCensusDTO.java | 19 +++++ .../controller/ActInfoController.java | 18 +++++ .../epdc/modules/activity/dao/ActInfoDao.java | 6 ++ .../activity/service/ActInfoService.java | 7 +- .../service/impl/ActInfoServiceImpl.java | 24 ++++++ .../resources/mapper/activity/ActInfoDao.xml | 36 +++++++++ .../esua/epdc/dto/ScreenCommunityDTO.java | 5 ++ .../epdc/entity/ScreenCommunityEntity.java | 5 ++ .../resources/mapper/ScreenCommunityDao.xml | 1 + .../epdc/dto/ScreenVolunteerDetailDTO.java | 77 +++++++++++++++++++ .../esua/epdc/dto/ScreenVolunteerInfoDTO.java | 62 +++++++++++++++ .../controller/VolunteerInfoController.java | 29 +++++++ .../elink/esua/epdc/dao/VolunteerInfoDao.java | 7 ++ .../epdc/service/VolunteerInfoService.java | 7 ++ .../impl/VolunteerInfoServiceImpl.java | 17 +++- .../resources/mapper/VolunteerInfoDao.xml | 34 ++++++++ 17 files changed, 352 insertions(+), 12 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ScreenActCensusDTO.java create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/ScreenVolunteerDetailDTO.java create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/ScreenVolunteerInfoDTO.java diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java index 80519237..9bb12c64 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java @@ -238,11 +238,13 @@ public class IssueController { } /** - * @Description: 锦水大屏月度统计 - * @param id: - * @Return com.elink.esua.epdc.commons.tools.utils.Result + * @Description: 锦水大屏统计 + * @param startDate: + * @param endDate: + * @param type: + * @Return com.elink.esua.epdc.commons.tools.utils.Result> * @Author: lichao - * @Date: 2023/9/6 15:06 + * @Date: 2023/9/12 17:22 */ @GetMapping("screenJinShui/issueCensus") public Result> screenIssueCensus(@RequestParam String startDate, @RequestParam String endDate, @RequestParam String type) { diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ScreenActCensusDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ScreenActCensusDTO.java new file mode 100644 index 00000000..1a82b930 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ScreenActCensusDTO.java @@ -0,0 +1,19 @@ +package com.elink.esua.epdc.activity.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 大屏统计 + * @Author LC + * @Date 2019/9/6 15:58 + */ +@Data +public class ScreenActCensusDTO implements Serializable { + private static final long serialVersionUID = 8931053684837605978L; + + private String date; + + private Integer count; +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActInfoController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActInfoController.java index 5fd0657b..001d44ad 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActInfoController.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActInfoController.java @@ -21,6 +21,7 @@ import com.elink.esua.epdc.activity.ActInfoDTO; import com.elink.esua.epdc.activity.form.ActInfoFormDTO; import com.elink.esua.epdc.activity.form.ActTopFormDTO; import com.elink.esua.epdc.activity.result.ActInfoResultDTO; +import com.elink.esua.epdc.activity.result.ScreenActCensusDTO; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; @@ -31,6 +32,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.constant.ActStateConstant; +import com.elink.esua.epdc.dto.issue.ScreenIssueCensusDTO; import com.elink.esua.epdc.dto.item.ItemTopFormDTO; import com.elink.esua.epdc.modules.activity.excel.ActInfoExcel; import com.elink.esua.epdc.modules.activity.service.ActInfoService; @@ -136,4 +138,20 @@ public class ActInfoController { ValidatorUtils.validateEntity(formDto); return actInfoService.modifyActTopFlag(formDto); } + + + /** + * @Description: 锦水大屏统计 + * @param startDate: + * @param endDate: + * @param type: + * @Return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2023/9/12 17:21 + */ + @GetMapping("screenJinShui/actCensus") + public Result> screenactCensus(@RequestParam String startDate, @RequestParam String endDate, @RequestParam String type) { + List result = actInfoService.screenactCensus(startDate,endDate,type); + return new Result>().ok(result); + } } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActInfoDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActInfoDao.java index 066fbc2b..202b42e9 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActInfoDao.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActInfoDao.java @@ -169,4 +169,10 @@ public interface ActInfoDao extends BaseDao { * @return java.util.List */ List selectByTeamId(@Param("teamId") String teamId); + + List screenactCensusForMonth(String startDate, String endDate); + + List screenactCensusForQuarter(String startDate, String endDate); + + List screenactCensusForYear(String startDate, String endDate); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java index 7b07e685..bfd97da4 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java @@ -22,10 +22,7 @@ import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; import com.elink.esua.epdc.activity.form.ActInfoFormDTO; import com.elink.esua.epdc.activity.form.ActSignInListFormDTO; import com.elink.esua.epdc.activity.form.ActTopFormDTO; -import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; -import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; -import com.elink.esua.epdc.activity.result.ActInfoResultDTO; -import com.elink.esua.epdc.activity.result.ActSignInListResultDTO; +import com.elink.esua.epdc.activity.result.*; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -255,4 +252,6 @@ public interface ActInfoService extends BaseService { * @return com.elink.esua.epdc.commons.tools.utils.Result **/ Result modifyActTopFlag(ActTopFormDTO formDto); + + List screenactCensus(String startDate, String endDate, String type); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java index f1a193ee..9e85c730 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java @@ -51,6 +51,7 @@ import com.elink.esua.epdc.constant.*; import com.elink.esua.epdc.dto.ScheduleJobDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeUpdateFormDTO; +import com.elink.esua.epdc.dto.issue.ScreenIssueCensusDTO; import com.elink.esua.epdc.modules.activity.dao.*; import com.elink.esua.epdc.modules.activity.entity.ActBannerEntity; import com.elink.esua.epdc.modules.activity.entity.ActInfoEntity; @@ -875,6 +876,29 @@ public class ActInfoServiceImpl extends BaseServiceImpl screenactCensus(String startDate, String endDate, String type) { + + List result = new ArrayList<>(); + + // type 月份 季度 年份 + if (type.equals("month")){ + + result = baseDao.screenactCensusForMonth(startDate,endDate); + + }else if (type.equals("quarter")){ + + result = baseDao.screenactCensusForQuarter(startDate,endDate); + + }else if (type.equals("year")){ + + result = baseDao.screenactCensusForYear(startDate,endDate); + + } + + return result; + } + /** * 校验活动详细时间段 * diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml index 7beea5a0..b0b1078f 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml @@ -609,4 +609,40 @@ select * from epdc_act_info where TEAM_ID=#{teamId} AND DEL_FLAG='0' + + + diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenCommunityDTO.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenCommunityDTO.java index eb45a335..26ed61e1 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenCommunityDTO.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenCommunityDTO.java @@ -113,6 +113,11 @@ public class ScreenCommunityDTO implements Serializable { */ private String partyGroupId; + /** + * 产品组织id + */ + private String agencyId; + /** * 创建人 */ diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenCommunityEntity.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenCommunityEntity.java index fe484215..638db973 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenCommunityEntity.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenCommunityEntity.java @@ -113,4 +113,9 @@ public class ScreenCommunityEntity extends BaseEpdcEntity { */ private String partyGroupId; + /** + * 产品组织id + */ + private String agencyId; + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenCommunityDao.xml b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenCommunityDao.xml index 19d0ee8a..c3c27937 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenCommunityDao.xml +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenCommunityDao.xml @@ -18,6 +18,7 @@ + diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/ScreenVolunteerDetailDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/ScreenVolunteerDetailDTO.java new file mode 100644 index 00000000..2c84029a --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/ScreenVolunteerDetailDTO.java @@ -0,0 +1,77 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + + +/** + * 志愿者信息表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2019-12-11 + */ +@Data +public class ScreenVolunteerDetailDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 爱心时长(单位：分钟) + */ + private BigDecimal kindnessTime; + + + /** + * 志愿者昵称 + */ + private String volunteerNickname; + + + private String deptName; + + /** + * 姓名 + */ + private String realName; + + /** + * 性别(0-女，1-男) + */ + private String sex; + + /** + * 积分，连user表查询 + */ + private int points; + + + /** + * 志愿者注册时间 + */ + private String registTimeString; + +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/ScreenVolunteerInfoDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/ScreenVolunteerInfoDTO.java new file mode 100644 index 00000000..7c70df9d --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/ScreenVolunteerInfoDTO.java @@ -0,0 +1,62 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + + +/** + * 志愿者信息表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2019-12-11 + */ +@Data +public class ScreenVolunteerInfoDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 爱心时长(单位：分钟) + */ + private BigDecimal kindnessTime; + + + /** + * 志愿者昵称 + */ + private String volunteerNickname; + + /** + * 志愿者头像 + */ + private String volunteerFaceImg; + + private String deptName; + +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java index d6dc885e..96129b6d 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java @@ -24,6 +24,8 @@ import com.elink.esua.epdc.commons.tools.validator.AssertUtils; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.ScreenVolunteerDetailDTO; +import com.elink.esua.epdc.dto.ScreenVolunteerInfoDTO; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.VolunteerInfoDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO; @@ -285,5 +287,32 @@ public class VolunteerInfoController { return new Result>().ok(page); } + /** + * @Description: 大屏志愿者统计分页 + * @param params: + * @Return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2023/9/12 16:39 + */ + @GetMapping("screenJinShui/page") + public Result> screenPage(@RequestParam Map params) { + PageData page = volunteerInfoService.screenPage(params); + return new Result>().ok(page); + } + + + /** + * @Description: 大屏志愿者详情 + * @param volunteerId: + * @Return com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lichao + * @Date: 2023/9/12 16:56 + */ + @GetMapping("screenJinShui/detail") + public Result screenDetail(@RequestParam String volunteerId) { + ScreenVolunteerDetailDTO result = volunteerInfoService.screenDetail(volunteerId); + return new Result().ok(result); + } + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java index 464fdf61..38020c37 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java @@ -18,6 +18,8 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.ScreenVolunteerDetailDTO; +import com.elink.esua.epdc.dto.ScreenVolunteerInfoDTO; import com.elink.esua.epdc.dto.UserTagDTO; import com.elink.esua.epdc.dto.VolunteerInfoDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcAppVolunteerListFormDTO; @@ -58,6 +60,11 @@ public interface VolunteerInfoDao extends BaseDao { */ List volunteerInfoList(Map params); + + List volunteerScreenInfoList(); + + ScreenVolunteerDetailDTO volunteerScreenDetail(@Param("volunteerId") String volunteerId); + /** * 根据志愿者ID，查询志愿者 单条详情 * 积分需要连user表查询 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java index d3da3a84..071fff77 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java @@ -20,6 +20,8 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.ScreenVolunteerDetailDTO; +import com.elink.esua.epdc.dto.ScreenVolunteerInfoDTO; import com.elink.esua.epdc.dto.UserTagDTO; import com.elink.esua.epdc.dto.VolunteerInfoDTO; import com.elink.esua.epdc.dto.epdc.form.*; @@ -49,6 +51,9 @@ public interface VolunteerInfoService extends BaseService { */ PageData volunteerInfo(Map params); + + PageData screenPage(Map params); + /** * 根据志愿者ID，查询志愿者 单条详情 * 积分需要连user表查询 @@ -279,4 +284,6 @@ public interface VolunteerInfoService extends BaseService { * @return com.elink.esua.epdc.commons.tools.utils.Result> */ PageData getVolunteerListForPionner(Map params); + + ScreenVolunteerDetailDTO screenDetail(String volunteerId); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java index 99d49a5c..47a1f2df 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java @@ -35,10 +35,7 @@ import com.elink.esua.epdc.constant.UserFieldConsant; import com.elink.esua.epdc.constant.VolunteerInfoNoticeConstant; import com.elink.esua.epdc.dao.VlounteerTeamRealationDao; import com.elink.esua.epdc.dao.VolunteerInfoDao; -import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; -import com.elink.esua.epdc.dto.UserTagDTO; -import com.elink.esua.epdc.dto.VolunteerInfoDTO; -import com.elink.esua.epdc.dto.VolunteerTagRelationDTO; +import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.form.v2.EpdcCompleteVolunteerInfoV2FormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO; @@ -116,6 +113,13 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl(list, page.getTotal()); } + @Override + public PageData screenPage(Map params) { + IPage page = getPage(params); + List list = baseDao.volunteerScreenInfoList(); + return new PageData<>(list, page.getTotal()); + } + /** * 根据志愿者ID，查询志愿者 单条详情 * 积分需要连user表查询 @@ -611,6 +615,11 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl + + + + +