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/service/impl/NeedProblemClaimServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
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 4ced7c2..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
@@ -93,10 +94,10 @@
}
@Override
- public R expurgateData(String id)
+ 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();
@@ -105,7 +106,7 @@
return R.fail("任务已开始！不能取消");
}
- int num=baseMapper.expurgateData(id);
+ int num=baseMapper.expurgateData(id, taskId, userId);
if(num>0)
{
return R.ok();
--
Gitblit v1.7.1