#feat ,,

yanghui

2022-12-05 c1bec68e4ac573fdc3007c6d1e1b6b868d43b2ae

#feat ,,

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -11148,7 +11148,7 @@
     * @return
     */
    @PostMapping("pageActivityBigScreen")
    R pageActivityBigScreen(@RequestBody CommonPage commonPage);
    R pageActivityBigScreen(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 疫情防控 健康码统计

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BasicScreenApi.java

@@ -1,6 +1,7 @@
package com.panzhihua.community_backstage.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
@@ -89,8 +90,8 @@
     */
    @PostMapping("pageActivityBigScreen")
    @ApiOperation(value = "大屏-社区活动分页", response = ComActActivityBigScreenVO.class)
    public R pageActivityBigScreen(@RequestBody CommonPage commonPage) {
        return communityService.pageActivityBigScreen(commonPage);
    public R pageActivityBigScreen(@RequestBody PageBaseDTO pageBaseDTO) {
        return communityService.pageActivityBigScreen(pageBaseDTO);
    }

    @ApiOperation(value = "单位活动统计 range,year", response = ActivityAnalysisVO.class)

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -9,6 +9,7 @@
import javax.annotation.Resource;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
import com.panzhihua.common.model.dtos.community.PageActivityInviteDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
@@ -2803,8 +2804,8 @@
     * @return
     */
    @GetMapping("pageActivityBigScreen")
    public R pageActivityBigScreen(@RequestBody CommonPage commonPage){
        return comActActivityService.pageActivityBigScreen(commonPage);
    public R pageActivityBigScreen(@RequestBody PageBaseDTO pageBaseDTO){
        return comActActivityService.pageActivityBigScreen(pageBaseDTO);
    }

    @GetMapping("easyphoto/selectStatisticsPhoto")

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java

@@ -3,6 +3,7 @@
import java.util.List;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
import com.panzhihua.common.model.dtos.community.PageActivityInviteDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
@@ -335,5 +336,5 @@
     * @param commonPage
     * @return
     */
    R pageActivityBigScreen(CommonPage commonPage);
    R pageActivityBigScreen(PageBaseDTO pageBaseDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java

@@ -22,6 +22,7 @@
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.hutool.core.collection.CollUtil;
import com.panzhihua.common.constants.HttpStatus;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
import com.panzhihua.service_community.dao.ComActNeighborCircleDAO;
import com.panzhihua.service_community.dao.ComActNeighborCircleTopicWestMapper;
@@ -1305,7 +1306,7 @@
    }

    @Override
    public R pageActivityBigScreen(CommonPage commonPage) {
        return R.ok(comActActivityDAO.pageActivityBigScreen(new Page<>(commonPage.getPage(),commonPage.getSize())));
    public R pageActivityBigScreen(PageBaseDTO pageBaseDTO) {
        return R.ok(comActActivityDAO.pageActivityBigScreen(new Page<>(pageBaseDTO.getPageNum(),pageBaseDTO.getPageSize())));
    }
}