值班表导入bug修改

tangxiaobao

2021-08-04 aa76c2b0bb73e9fe463387fb5656ea80094eceec

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

@@ -258,7 +258,7 @@
     * @return 详情
     */
    @PostMapping("detailactivity")
    public R detailActivity(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
    public R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId",required = false) Long userId) {
        ComActActivityVO comActActivityVO = comActActivityService.inforActivity(id, userId);
        if (ObjectUtils.isEmpty(comActActivityVO)) {
            return R.fail("活动不存在");
@@ -374,18 +374,25 @@
     */
    @PostMapping("putdynamic")
    public R putDynamic(@RequestBody ComActDynVO comActDynVO) {
        ComActDynDO comActDynDO = new ComActDynDO();
        Long id = comActDynVO.getId();
        BeanUtils.copyProperties(comActDynVO, comActDynDO);
        ComActDynDO comActDynDO = comActDynService.getById(comActDynVO.getId());
        if(comActDynDO == null){
            return R.fail("未查到社区动态记录");
        }
//        Long id = comActDynVO.getId();
        Integer isTopping = comActDynVO.getIsTopping();
        boolean b = isTopping.intValue() == 1;
        boolean b = isTopping.equals(1);
        if(b){
            ComActDynDO comActDynDO1 = comActDynService.getById(id);
            Integer status = comActDynDO1.getStatus();
            if (status.intValue()==0) {
                return R.fail("该动态还未发布");
            Integer status = comActDynDO.getStatus();
            if (status.equals(0)) {
                return R.fail("待发布的社区动态不可置顶");
            }
        }

//        if(StringUtils.isEmpty(comActDynVO.getCover())){
//            comActDynVO.setCover(comActDynDO.getCover());
//        }
        BeanUtils.copyProperties(comActDynVO, comActDynDO);

        boolean update = comActDynService.updateById(comActDynDO);
        if (update) {
//            最多只能设置三条置顶状态，后边设置会取消先前设置的置顶
@@ -1723,4 +1730,65 @@
    R setCommunityAuthType(@RequestParam("communityId")Long communityId,@RequestParam("type") Integer type){
        return eldersAuthService.setCommunityAuthType(communityId, type);
    }

    /**
     * 随手拍活动定时任务
     * @return  执行结果
     */
    @PostMapping("timeTaskEasyPhotoActivity")
    public R timeTaskEasyPhotoActivity(){
        return comActEasyPhotoActivityService.timeTaskEasyPhotoActivity();
    }

    /**
     * 社区随手拍列表统计
     * @param communityId   社区id
     * @return  统计结果
     */
    @GetMapping("easyphoto/statistics")
    public R easyPhotoStatistics(@RequestParam("communityId")Long communityId) {
        return comActEasyPhotoService.easyPhotoStatistics(communityId);
    }

    /**
     * 综治后台-查询社区列表
     * @return  社区列表
     */
    @GetMapping("/eventgrid/community/list")
    public R getCommunityLists(){
        return comActService.getCommunityLists();
    }

    /**
     * 随手拍发放奖励
     * @param grantRewardDTO    请求参数
     * @return  发放结果
     */
    @PostMapping("/easyphoto/grantReward")
    public R grantReward(@RequestBody GrantRewardDTO grantRewardDTO) {
        return comActEasyPhotoService.grantReward(grantRewardDTO);
    }

    /**
     * 获取最新活动和用户最新收益
     * @param userId    用户id
     * @param communityId   社区id
     * @return  最新活动和用户最新收益
     */
    @PostMapping("easyphoto/getUserReward")
    public R getUserReward(@RequestParam("userId") Long userId,@RequestParam("communityId") Long communityId) {
        return comActEasyPhotoService.getUserReward(userId,communityId);
    }

    /**
     * 读取用户随手拍奖励
     * @param userId    用户id
     * @return  读取结果
     */
    @PostMapping("easyphoto/readUserReward")
    public R readUserReward(@RequestParam("userId") Long userId,@RequestParam("communityId") Long communityId) {
        return comActEasyPhotoService.readUserReward(userId,communityId);
    }


}