From d5e21a2737d62e7e0c74f94f1330dec56ae748eb Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 14 十一月 2023 16:54:22 +0800
Subject: [PATCH] 修改任务社区id4
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemClaimService.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java | 6 ++++--
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java | 7 ++++---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemClaimApi.java | 6 ++++--
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemClaimDAO.java | 4 +++-
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemClaimMapper.xml | 6 ++++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java | 4 +++-
7 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
index cf620eb..37418fc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
@@ -136,9 +136,11 @@
@ApiOperation(value = "任务报名详情", response = NeedProblemClaimDTO.class)
@GetMapping("/getNeedClaimDetails")
- public R getNeedClaimDetails(@RequestParam("id") String id)
+ public R getNeedClaimDetails(@RequestParam(value = "id", required = false) String id,
+ @RequestParam(value = "taskId", required = false) String taskId,
+ @RequestParam(value = "userId", required = false) String userId)
{
- return newStriveForFeign.getNeedClaimDetails(id);
+ return newStriveForFeign.getNeedClaimDetails(id,taskId,userId);
}
@ApiOperation(value = "任务报名")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
index 6039e06..fbc03fb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
@@ -87,7 +87,9 @@
@RequestParam(value = "unitId", required = false) String unitId);
@GetMapping("/NeedClaim/getNeedClaimDetails")
- public R getNeedClaimDetails(@RequestParam("id") String id);
+ public R getNeedClaimDetails(@RequestParam(value = "id", required = false) String id,
+ @RequestParam(value = "taskId", required = false) String taskId,
+ @RequestParam(value = "userId", required = false) String userId);
@PostMapping("/NeedClaim/addNeedClaimData")
public R addNeedClaimData(@RequestBody NeedProblemClaimDTO item);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemClaimApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemClaimApi.java
index 5fcb43d..bbf823f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemClaimApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemClaimApi.java
@@ -26,9 +26,11 @@
}
@GetMapping("/getNeedClaimDetails")
- public R getNeedClaimDetails(@RequestParam("id") String id)
+ public R getNeedClaimDetails(@RequestParam(value = "id", required = false) String id,
+ @RequestParam(value = "taskId", required = false) String taskId,
+ @RequestParam(value = "userId", required = false) String userId)
{
- return R.ok(claimService.getDetails(id));
+ return R.ok(claimService.getDetails(id, taskId, userId));
}
@PostMapping("/addNeedClaimData")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemClaimDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemClaimDAO.java
index c7037d1..d9415e0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemClaimDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemClaimDAO.java
@@ -24,7 +24,9 @@
@Param("userId") String userId,
@Param("unitId") String unitId);
- NeedProblemClaimDTO getDetails(@Param("id")String id);
+ NeedProblemClaimDTO getDetails(@Param("id")String id,
+ @Param("taskId") String taskId,
+ @Param("userId") String userId);
NeedProblemClaimDTO getUserIdDetails(@Param("taskId") String taskId,
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemClaimService.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemClaimService.java
index 94cea95..c394358 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemClaimService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemClaimService.java
@@ -20,7 +20,7 @@
List<NeedProblemClaimDTO> getList(String taskId, String userId, String unitId);
- NeedProblemClaimDTO getDetails(String id);
+ NeedProblemClaimDTO getDetails(String id,String taskId,String userId);
R addData(NeedProblemClaimDTO item);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java
index 1977a19..f5427d6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java
@@ -10,6 +10,7 @@
import com.panzhihua.service_dangjian.dao.NeedProblemClaimDAO;
import com.panzhihua.service_dangjian.service.NeedProblemClaimService;
import com.panzhihua.service_dangjian.service.NeedProblemInventoryService;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -38,8 +39,8 @@
}
@Override
- public NeedProblemClaimDTO getDetails(String id) {
- return baseMapper.getDetails(id);
+ public NeedProblemClaimDTO getDetails(String id,String taskId, String userId) {
+ return baseMapper.getDetails(id,taskId,userId);
}
@Override
@@ -96,7 +97,7 @@
public R expurgateData(String id,String taskId,String userId)
{
//报名信息
- NeedProblemClaimDTO claimDTO=baseMapper.getDetails(id);
+ NeedProblemClaimDTO claimDTO=baseMapper.getDetails(id,taskId,userId);
NeedProblemInventoryDTO inventoryDTO=inventoryService.getDetails(claimDTO.getTaskId(),claimDTO.getUserId());
long times=System.currentTimeMillis();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemClaimMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemClaimMapper.xml
index ddd974e..5793ca4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemClaimMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemClaimMapper.xml
@@ -68,6 +68,12 @@
<if test="id !=null and id != '' ">
and nfnpc.id =#{id}
</if>
+ <if test="taskId !=null and taskId != '' ">
+ and nfnpc.task_id =#{taskId}
+ </if>
+ <if test="userId !=null and userId != '' ">
+ and nfnpc.user_id =#{userId}
+ </if>
</where>
</select>
--
Gitblit v1.7.1