101captain
2022-06-29 6905023c1ce3239f5b2569caac6d151e9788841c
Merge branch 'huacheng_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_dev

 Conflicts:
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java
3个文件已修改
48 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -11,6 +11,7 @@
import com.panzhihua.common.model.vos.common.ComMngVolunteerServiceTypeVo;
import com.panzhihua.common.model.vos.common.ComMngVolunteerSkillVo;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.neighbor.ActivityAnalysisVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAnalysisVO;
import io.swagger.annotations.*;
import org.springframework.util.ObjectUtils;
@@ -363,7 +364,7 @@
        return communityService.addActivity(comActActivityVO);
    }
    @ApiOperation(value = "单位活动统计",response = ComActNeighborCircleAnalysisVO.class)
    @ApiOperation(value = "单位活动统计",response = ActivityAnalysisVO.class)
    @GetMapping("activity/unit/analysis")
    public R activityUnitAnalysis(@RequestParam(value = "year") Integer year,@RequestParam("communityId") Long communityId ){
        return communityService.institutionalUnitServiceAnalysis(year,communityId);
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
@@ -395,5 +395,4 @@
    public R institutionalUnitServiceAnalysis(@RequestParam(value = "year",required = false) Integer year,@RequestParam(value = "communityId",required = false) Long communityId){
        return this.comActNeighborCircleService.institutionalUnitServiceAnalysis(year,communityId);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java
@@ -36,7 +36,7 @@
    /**
     * 用户发布邻里圈审核
     *
     *
     * @param addNeighborCircleAppDTO
     *            邻里圈请求参数
     * @return 发布结果
@@ -45,7 +45,7 @@
    /**
     * 查看邻里圈详情
     *
     *
     * @param neighborCircleAppDTO
     *            请求参数
     * @return 邻里圈详情
@@ -54,14 +54,14 @@
    /**
     * 管理后台查询邻里圈列表
     *
     *
     * @return
     */
    R pageNeighborByAdmin(ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
    /**
     * 邻里圈_添加
     *
     *
     * @param addNeighborCircleAdminVO
     * @return
     */
@@ -69,7 +69,7 @@
    /**
     * 邻里圈_修改
     *
     *
     * @param editNeighborCircleAdminVO
     * @return
     */
@@ -77,14 +77,14 @@
    /**
     * 后台删除未审核的邻里圈(待审核状态不可删除,显示、隐藏、已驳回的都可以删除)
     *
     *
     * @return
     */
    R deleteByAdmin(Long id);
    /**
     * 查看邻里圈基础_详情
     *
     *
     * @param id
     *            邻里圈id
     * @return
@@ -93,7 +93,7 @@
    /**
     * 邻里圈的所有评论_分页
     *
     *
     * @param detailNeighborAllCommentByAdminDTO
     *            参数
     * @return
@@ -102,7 +102,7 @@
    /**
     * 评论的状态_修改
     *
     *
     * @param changeStatusComment
     * @return
     */
@@ -110,7 +110,7 @@
    /**
     * 邻里圈评论_详情
     *
     *
     * @param id
     *            评论id
     * @return
@@ -119,7 +119,7 @@
    /**
     * 邻里圈评论回复_分页
     *
     *
     * @param dto
     *            参数
     * @return
@@ -128,7 +128,7 @@
    /**
     * 邻里圈评论回复_基本详情
     *
     *
     * @param id
     * @return
     */
@@ -136,7 +136,7 @@
    /**
     * 评论的回复状态_修改
     *
     *
     * @param changeStatusReplyVO
     * @return
     */
@@ -144,7 +144,7 @@
    /**
     * 用户查询邻里圈列表
     *
     *
     * @param neighborCircleAppDTO
     *            请求参数
     * @return 邻里圈列表
@@ -153,7 +153,7 @@
    /**
     * 邻里圈点赞
     *
     *
     * @param fabulousAppDTO
     *            请求参数
     * @return 点赞结果
@@ -162,7 +162,7 @@
    /**
     * 邻里圈转发
     *
     *
     * @param forwardAppDTO
     *            请求参数
     * @return 转发结果
@@ -171,7 +171,7 @@
    /**
     * 邻里圈评论
     *
     *
     * @param commentAppDTO
     *            请求参数
     * @return 评论结果
@@ -180,7 +180,7 @@
    /**
     * 邻里圈回复
     *
     *
     * @param replyAppDTO
     *            请求参数
     * @return 回复结果
@@ -189,14 +189,14 @@
    /**
     * 定时任务更新邻里圈近3天评论数/点赞数/浏览量
     *
     *
     * @return 执行结果
     */
    R timeTaskCircleFlow();
    /**
     * 邻里圈取消点赞
     *
     *
     * @param fabulousAppDTO
     *            请求参数
     * @return 取消点赞结果
@@ -205,7 +205,7 @@
    /**
     * 添加邻里圈浏览记录
     *
     *
     * @param addBrowseAppDTO
     *            请求参数
     * @return 返回参数
@@ -214,7 +214,7 @@
    /**
     * 分页查询评论下所有回复
     *
     *
     * @param commentReplyAppDTO
     *            请求参数
     * @return 回复列表