Merge remote-tracking branch 'origin/master'

CeDo

2021-04-27 a3aa71fd0ba1b48fe52f080e8d2776f50c5ed514

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

@@ -21,6 +21,7 @@
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import java.util.List;
@@ -740,6 +741,15 @@
     */
    @PostMapping("timedtaskactactivityall")
    R timedTaskActActivityAll();


    /**
     * 定时任务刷新社区活动的各个状态 除取消外
     *
     * @return
     */
    @PostMapping("timedtaskactmicrowishall")
    R timedTaskActMicroWishAll();

    /**
     * 其他建筑详情
@@ -2158,7 +2168,7 @@
    R editPopulation(@RequestBody EditComMngPopulationVO editComMngPopulationVO, @RequestParam("communityId") Long communityId);

    /**
     * 微心愿 删除
     * 微心愿删除
     * @param id 微心愿id
     */
    @PostMapping("deletemicrowish")
@@ -2171,4 +2181,53 @@
     */
    @PostMapping("common/data/special/page")
    R specialInputUser(@RequestBody PageInputUserDTO pageInputUserDTO);

    /**
     * 删除特殊群体人员
     * @param id    特殊群体id
     * @return  删除结果
     */
    @PostMapping("common/data/special/delete")
    R deleteSpecialInputUser(@RequestParam(value = "id") Long id);


    /**
     * 办事指南_新增
     * @param workGuideVO 新增信息
     * @return 新增结果
     */
    @PostMapping("/addworkguide")
    R addWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO, @RequestParam("userId")Long userId);

    /**
     * 办事指南_编辑
     * @param workGuideVO
     * @return 编辑结果
     */
    @PostMapping("/editworkguide")
    R editWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO, @RequestParam("userId")Long userId);

    /**
     * 办事指南_详情
     * @param workGuideId
     * @return 详情
     */
    @GetMapping("/detailworkguide")
    R detailWorkGuide(@RequestParam("workGuideId")Long workGuideId);
    /**
     * 办事指南_分页
     * @param pageActWorkGuideDTO 查询参数
     * @return 分页集合
     */
    @PostMapping("/pageworkguide")
    R pageWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO);

    /**
     * 办事指南_删除
     * @param workGuideId 办事指南id
     * @return 删除结果
     */
    @PostMapping("/delectworkguide")
    R delectWorkGuide(@RequestParam("workGuideId") Long workGuideId);

}