diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java index a39fb19..d4cfbd6 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java @@ -307,4 +307,82 @@ public class EpdcScreenController { ValidatorUtils.validateEntity(formDto); return epdcScreenService.itemList(formDto); } + + /** + * 多元服务-党员服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/9/2 13:44 + */ + @GetMapping("multipleService/partyMemberServices") + public Result> partyMemberServices(@RequestBody EpdcScreenPartyMemberServicesFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.partyMemberServices(formDto); + } + + /** + * 多元服务-地图党员服务 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/9/2 13:44 + */ + @GetMapping("multipleService/mapPartyMemberServices") + public Result> mapPartyMemberServices(@RequestBody EpdcScreenMapPartyMemberServicesFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.mapPartyMemberServices(formDto); + } + + /** + * 多元服务-社区服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + @GetMapping("multipleService/communityServices") + public Result> communityServices(@RequestBody EpdcScreenBasePageFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.getCommunityServices(formDto); + } + + /** + * 多元服务-地图-社区服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + @GetMapping("multipleService/mapCommunityServices") + public Result> mapCommunityServices(@RequestBody EpdcScreenBasePageFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.getMapCommunityServices(formDto); + } + + /** + * 多元服务-志愿服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + @GetMapping("multipleService/volunteerServices") + public Result> volunteerServices(@RequestBody EpdcScreenBasePageFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.getVolunteerServices(formDto); + } + + /** + * 多元服务-地图-志愿服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + @GetMapping("multipleService/mapVolunteerServices") + public Result> mapVolunteerServices(@RequestBody EpdcScreenBasePageFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.getMapVolunteerServices(formDto); + } } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java index df4d344..10ec12f 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java @@ -1,7 +1,6 @@ package com.elink.esua.epdc.modules.screen.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import org.apache.ibatis.annotations.Mapper; @@ -238,4 +237,61 @@ public interface EpdcScreenDao extends BaseDao itemList(EpdcScreenItemListFormDTO formDto); + /** + * 多元服务-党员服务列表 + * @params [formDto] + * @return java.util.List + * @author jyyzz + * @since 2021/9/2 14:03 + */ + List partyMemberServices(EpdcScreenPartyMemberServicesFormDTO formDto); + + /** + * 多元服务-地图党员服务 + * @params [formDto] + * @return java.util.List + * @author jyyzz + * @since 2021/9/2 14:03 + */ + List mapPartyMemberServices(EpdcScreenMapPartyMemberServicesFormDTO formDto); + + /** + * 多元服务-社区服务列表 + * 统计社区这一级别发布的(type_key = community_party)已上架(ACT_STATUS = '1') 的 社区活动(ACT_TYPE = '0') + * + * @params [formDto] + * @return java.util.List + * @author zy + * @since 2021/9/2 15:30 + */ + List selectListCommunityServices(EpdcScreenBasePageFormDTO formDto); + + /** + * 多元服务-地图-社区服务列表 + * @params [formDto] + * @return java.util.List + * @author zy + * @since 2021/9/2 15:30 + */ + List selectListMapCommunityServices(EpdcScreenBasePageFormDTO formDto); + + /** + * 多元服务-志愿服务列表 + * 统计已启用的志愿组织(is_open = '0')发布的 已上架(ACT_STATUS = '1') 的 志愿活动(ACT_TYPE = '1') + * @params [formDto] + * @return java.util.List + * @author zy + * @since 2021/9/2 15:30 + */ + List selectListVolunteerServices(EpdcScreenBasePageFormDTO formDto); + + /** + * 多元服务-地图-志愿服务列表 + * @params [formDto] + * @return java.util.List + * @author zy + * @since 2021/9/2 15:30 + */ + List selectListMapVolunteerServices(EpdcScreenBasePageFormDTO formDto); + } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java index e145904..8061a90 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java @@ -1,5 +1,6 @@ package com.elink.esua.epdc.modules.screen.service; +import com.baomidou.mybatisplus.extension.api.R; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; @@ -217,4 +218,59 @@ public interface EpdcScreenService { * @since 2021/8/23 19:02 */ Result> itemList(EpdcScreenItemListFormDTO formDto); + + /** + * 多元服务-党员服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/9/2 13:44 + */ + Result> partyMemberServices(EpdcScreenPartyMemberServicesFormDTO formDto); + + /** + * 多元服务-地图党员服务 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/9/2 13:44 + */ + Result> mapPartyMemberServices(EpdcScreenMapPartyMemberServicesFormDTO formDto); + + /** + * 多元服务-社区服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + Result> getCommunityServices(EpdcScreenBasePageFormDTO formDto); + + /** + * 多元服务-地图-社区服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + Result> getMapCommunityServices(EpdcScreenBasePageFormDTO formDto); + + /** + * 多元服务-志愿服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + Result> getVolunteerServices(EpdcScreenBasePageFormDTO formDto); + + /** + * 多元服务-地图-志愿服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + Result> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto); + } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java index e6dd957..9a91371 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java @@ -181,4 +181,56 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl>().ok(data); } + @Override + public Result> partyMemberServices(EpdcScreenPartyMemberServicesFormDTO formDto) { + List data = baseDao.partyMemberServices(formDto); + return new Result>().ok(data); + } + + @Override + public Result> mapPartyMemberServices(EpdcScreenMapPartyMemberServicesFormDTO formDto) { + List data = baseDao.mapPartyMemberServices(formDto); + return new Result>().ok(data); + } + + @Override + public Result> getCommunityServices(EpdcScreenBasePageFormDTO formDto) { + this.setPageIndex(formDto); + List data = baseDao.selectListCommunityServices(formDto); + return new Result>().ok(data); + } + + @Override + public Result> getMapCommunityServices(EpdcScreenBasePageFormDTO formDto) { + this.setPageIndex(formDto); + List data = baseDao.selectListMapCommunityServices(formDto); + return new Result>().ok(data); + } + + @Override + public Result> getVolunteerServices(EpdcScreenBasePageFormDTO formDto) { + this.setPageIndex(formDto); + List data = baseDao.selectListVolunteerServices(formDto); + return new Result>().ok(data); + } + + @Override + public Result> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto) { + this.setPageIndex(formDto); + List data = baseDao.selectListMapVolunteerServices(formDto); + return new Result>().ok(data); + } + + /** + * 分页统一处理方法 + * + * @param formDto + * @return void + * @Author zhangyong + * @Date 10:36 2021-09-06 + **/ + private void setPageIndex(EpdcScreenBasePageFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE)*formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + } } diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml index 3d4a8f7..f72f2bf 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -228,12 +228,6 @@ ui.CREATED_TIME DESC LIMIT #{pageIndex}, #{pageSize} - - UPDATE esua_epdc_user.epdc_user_info SET RECOMMEND_FLAG = '1' WHERE ID = #{id} AND DEL_FALG = '0' - - - UPDATE esua_epdc_user.epdc_user_info SET RECOMMEND_FLAG = '0' WHERE ID = #{id} AND DEL_FALG = '0' - + + + + + + + + + + + + + + + + + + + + + + + +