Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

luoxinwu

2024-03-05 c88d1658a2b6b51ed1a81c3be3e9102b661970f3

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

@@ -1,6 +1,5 @@
package com.panzhihua.service_dangjian.api;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.partybuilding.NewFightCommunityConstructionDTO;
import com.panzhihua.common.model.dtos.partybuilding.NewFightProjectEvaluateDTO;
import com.panzhihua.common.model.dtos.partybuilding.NewFightProjectJoinDTO;
@@ -33,9 +32,10 @@
    }

    @GetMapping("/getNeedClaimDetails")
    public R getNewFightCommunityDetails(@RequestParam("id") String id)
    public R getNewFightCommunityDetails(@RequestParam("id") String id,
                                         @RequestParam(value = "userId", required = false)  String userId)
    {
        return R.ok(claimService.getDetails(id));
        return R.ok(claimService.getDetails(id,userId));
    }

    @PostMapping("/addNeedClaimData")
@@ -99,6 +99,13 @@
    }


    @GetMapping("/editProjectPlanAccomplish")
    public R  editProjectPlanAccomplish(@RequestParam("id") String id)
    {
        return projectPlanService.editProjectPlanAccomplish(id);
    }


    /********************************************************************************************************
     *
     *                           项目参与
@@ -135,11 +142,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);
    }

    /********************************************************************************************************
     *
     *                           项目评论
@@ -151,7 +159,7 @@
    private NewFightProjectEvaluateService evaluateService;


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