add:随手拍 删除

CeDo

2021-05-20 8e11b215f41de318376edba6125218c72530ce37

add:随手拍 删除

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

@@ -195,6 +195,16 @@
    R detailEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId);

    /**
     * 随手拍删除
     *
     * @param id     随手拍主键
     * @param userId 登录用户id
     * @return 详情内容
     */
    @PostMapping("deleteEasyPhoto")
    R deleteEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId);

    /**
     * 分页查询微心愿
     *
     * @param comActMicroWishVO 查询参数

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

@@ -248,6 +248,13 @@
        return communityService.detailEasyPhoto(id, userId);
    }

    @ApiOperation(value = "删除随手拍", response = ComActEasyPhotoVO.class)
    @DeleteMapping("easyphoto/{id}")
    public R deleteEasyPhoto(@PathVariable("id") Long id) {
        Long userId = this.getUserId();
        return communityService.deleteEasyPhoto(id, userId);
    }

    @ApiOperation(value = "分页查询微心愿")
    @PostMapping("pagemicrowish")
    public R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {

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

@@ -465,6 +465,26 @@
    }

    /**
     * 随手拍删除
     *
     * @param id     随手拍主键
     * @param userId 登录用户
     * @return 详情内容
     */
    @PostMapping("deleteEasyPhoto")
    public R deleteEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
        ComActEasyPhotoDO comActEasyPhotoDO = comActEasyPhotoService.getBaseMapper().selectById(id);
        if(comActEasyPhotoDO==null){
            return R.fail("随手拍不存在");
        }
        comActEasyPhotoDO.setDelTag(1);
        int updateById = comActEasyPhotoService.getBaseMapper().updateById(comActEasyPhotoDO);
        if(updateById==1){
            return R.ok();
        }
        return R.fail();
    }
    /**
     * 分页查询微心愿
     *
     * @param comActMicroWishVO 查询参数

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java

@@ -56,7 +56,7 @@
            "<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != &quot;&quot;'>" +
            "AND su.`name` like concat(#{comActEasyPhotoVO.handlerName},'%')  \n" +
            " </if> " +
            "where p.status !=2"+
            "where p.del_tag = 0 and p.status !=2"+
            "<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
            "  and p.community_id=#{comActEasyPhotoVO.communityId} " +
            " </if> " +
@@ -111,7 +111,7 @@
            "<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != &quot;&quot;'>" +
            "AND su.`name` like concat(#{comActEasyPhotoVO.handlerName},'%') \n" +
            " </if> " +
            "where  p.status=2 and p.is_need_feed_back=1 " +
            "where  p.del_tag = 0 and  p.status=2 and p.is_need_feed_back=1 " +
            "<if test='comActEasyPhotoVO.backUserId != null and comActEasyPhotoVO.backUserId != 0'>" +
            "and p.handler_id=#{comActEasyPhotoVO.backUserId}"+
            " </if> " +
@@ -163,14 +163,14 @@
            "JOIN sys_user u on p.sponsor_id=u.user_id\n" +
            "LEFT JOIN sys_user su on p.handler_id=su.user_id\n" +
            "LEFT JOIN com_act_easy_photo_user pu on p.id=pu.easy_photo_id\n" +
            "WHERE p.id=#{id}")
            "WHERE p.del_tag = 0 and p.id=#{id}")
    ComActEasyPhotoVO detailEasyPhoto(Long id);
    @Select("SELECT\n" +
            "'1' type\n" +
            "FROM\n" +
            "com_act_easy_photo p \n" +
            " com_act_easy_photo p \n" +
            "WHERE\n" +
            "p.community_id = #{communityId} \n" +
            " p.del_tag = 0 and p.community_id = #{communityId} \n" +
            "AND p.STATUS = 1 \n"+
            "\n" +
            "union all \n" +
@@ -178,9 +178,9 @@
            "SELECT\n" +
            "'1' type\n" +
            "FROM\n" +
            "com_act_easy_photo p \n" +
            " p.del_tag = 0 and com_act_easy_photo p \n" +
            "WHERE\n" +
            "p.community_id = #{communityId} \n" +
            " p.del_tag = 0 and p.community_id = #{communityId} \n" +
            "AND p.`status` = 2 and p.is_need_feed_back=1 and p.handler_id=#{userId}\n"
            )
    List<TodoEventsVO> selectNeedToDo(@Param("communityId") Long communityId, @Param("userId") Long userId);
@@ -210,6 +210,7 @@
            "left JOIN sys_user su ON p.handler_id = su.user_id \n" +
            "left JOIN com_act_easy_photo_comment c ON p.id = c.easy_photo_id \n" +
            " <where>" +
            " p.del_tag = 0  "  +
            "<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
            "  and p.community_id=#{comActEasyPhotoVO.communityId} " +
            " </if> " +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java

@@ -100,4 +100,9 @@
     * 地址备注
     */
    private String addrRemark;

    /**
     * 是否删除 0 否 1 是
     */
    private Integer delTag;
}