From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightCommunityConstructionApi.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightCommunityConstructionApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightCommunityConstructionApi.java
index 2c478b6..7fe5e1b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightCommunityConstructionApi.java
+++ b/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")
@@ -142,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);
}
-
/********************************************************************************************************
*
* 项目评论
@@ -158,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)
--
Gitblit v1.7.1