no

DESKTOP-71BH0QO\L、ming

2021-04-25 946a1812e92bd6333808981281038ef9d436c5b0

no

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

@@ -2155,4 +2155,11 @@
     */
    @PostMapping("/common/data/population/edit")
    R editPopulation(@RequestBody EditComMngPopulationVO editComMngPopulationVO, @RequestParam("communityId") Long communityId);

    /**
     * 微心愿 删除
     * @param id 微心愿id
     */
    @PostMapping("deletemicrowish")
    R deletemicrowish(@RequestParam("id")Long id);
}

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

@@ -393,4 +393,10 @@
    }


    @ApiOperation(value = "分页查询微心愿")
    @PostMapping("deletemicrowish")
    public R deleteMicrowish(@RequestParam("id")Long id) {
        return communityService.deletemicrowish(id);
    }

}

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

@@ -1445,4 +1445,13 @@
        return comActQuestnaireService.usersAnsweQuestnaire(usersAnswerQuestnaireVO,userId);
    }

    /**
     * 删除微心愿
     * @param id
     * @return
     */
    @GetMapping("deletemicrowish")
    public R deletemicrowish(@RequestParam("id") Long id){
        return comActMicroWishService.deleteMicroWish(id);
    }
}

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

@@ -54,4 +54,11 @@
     * @return 代办事件集合
     */
    List<TodoEventsVO> selectNeedToDo(Long communityId, Long userId);

    /**
     * 删除微心愿
     * @param id
     * @return
     */
    R deleteMicroWish(Long id);
}

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

@@ -51,8 +51,13 @@
        ComActActivityDO comActActivityDO=new ComActActivityDO();
        BeanUtils.copyProperties(comActActivityVO,comActActivityDO);
        Integer status = comActActivityVO.getStatus();
        Date now = new Date();
        if (status.intValue()!=1) {
            comActActivityDO.setPublishAt(new Date());//发布时间
            comActActivityDO.setPublishAt(now);//发布时间
        }
        //如果发布时间大于现在时间状态改为进行中
        if(now.getTime()<comActActivityVO.getBeginAt().getTime()){
            comActActivityDO.setStatus(3);
        }
        boolean save = this.save(comActActivityDO);
        if(!save){

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

@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -239,5 +240,14 @@
        return todoEventsVOS;
    }


    @Override
    public R deleteMicroWish(Long id) {
        ComActMicroWishDO comActMicroWishDO = comActMicroWishDAO.selectById(id);
        if(comActMicroWishDO==null){
            return R.fail("id有误!");
        }
        comActMicroWishDAO.deleteById(id);
        comActMicroWishUserDAO.delete(new LambdaQueryWrapper<ComActMicroWishUserDO>().eq(ComActMicroWishUserDO::getMicroWishId,id));
        return R.ok();
    }
}