组织共建项目退出

lidongdong

2023-11-15 5e9a79c7b14aa5a23389b8c7dddfc042be533750

组织共建项目退出

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java

@@ -354,9 +354,11 @@

    @ApiOperation(value = "项目参与人员取消报名")
    @DeleteMapping("/expurgateJoinData")
    public R expurgateJoinData(@RequestParam("id") String id)
    public R expurgateJoinData(@RequestParam(value = "id", required = false) String id,
                               @RequestParam(value = "projectId", required = false) String projectId,
                               @RequestParam(value = "userId", required = false) String userId)
    {
        return newStriveForFeign.expurgateJoinData(id);
        return newStriveForFeign.expurgateJoinData(id,projectId,userId);
    }



 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java

@@ -208,7 +208,9 @@
    public R editJoinData(@RequestBody NewFightProjectJoinDTO item);

    @DeleteMapping("/NewFightCommunity/expurgateJoinData")
    public R expurgateJoinData(@RequestParam("id") String id);
    public R expurgateJoinData(@RequestParam(value = "id", required = false) String id,
                               @RequestParam(value = "projectId", required = false) String projectId,
                               @RequestParam(value = "userId", required = false) String userId);



@@ -217,7 +219,6 @@
     *                           项目评论
     *
     ******************************************************************************************************/

    @GetMapping("/NewFightCommunity/getEvaluateList")
    public R getEvaluateList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageSize") int pageSize,

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightCommunityConstructionApi.java

@@ -143,11 +143,12 @@
    }

    @DeleteMapping("/expurgateJoinData")
    public R expurgateJoinData(@RequestParam("id") String id)
    public R expurgateJoinData(@RequestParam(value = "id", required = false) String id,
                               @RequestParam(value = "projectId", required = false) String projectId,
                               @RequestParam(value = "userId", required = false) String userId)
    {
        return joinService.expurgateData(id,null);
        return joinService.expurgateData(id,projectId,userId);
    }

    /********************************************************************************************************
     *
     *                           项目评论

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightProjectJoinDAO.java

@@ -25,6 +25,8 @@

    int editData(@Param("item") NewFightProjectJoinDTO item);

    int expurgateData(@Param("id") String id,@Param("projectId") String projectId);
    int expurgateData(@Param("id") String id,
                      @Param("projectId") String projectId,
                      @Param("userId") String userId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightProjectJoinService.java

@@ -21,6 +21,6 @@

    R editData(NewFightProjectJoinDTO item);

    R expurgateData(String id,String projectId);
    R expurgateData(String id,String projectId,String userId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightProjectJoinServiceImpl.java

@@ -57,9 +57,9 @@
    }

    @Override
    public R expurgateData(String id,String projectId)
    public R expurgateData(String id,String projectId,String userId)
    {
        int num= baseMapper.expurgateData(id,projectId);
        int num= baseMapper.expurgateData(id,projectId,userId);
        if(num>0)
        {
            return R.ok();

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightProjectJoinMapper.xml

@@ -105,6 +105,9 @@
            <if test="projectId!=null and projectId !='' ">
                and project_id=#{projectId}
            </if>
            <if test="userId!=null and userId !='' ">
                and user_id=#{userId}
            </if>
        </where>
    </delete>