From 2f44c4720f368d43efbc07013593b12268ffb230 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 10 七月 2024 10:39:47 +0800
Subject: [PATCH] 花城 修改问题清单状态刷新机制
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 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 fbf9b1e..079ade0 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,10 +10,12 @@
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;
import java.util.Date;
+import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -30,23 +32,22 @@
private NeedProblemInventoryService inventoryService;
@Override
- public IPage<NeedProblemClaimDTO> getList(int pageNum, int pageSize,
- String taskId, String userId,String unitId)
+ public List<NeedProblemClaimDTO> getList(String taskId, String userId, String unitId)
{
- Page page = new Page<>(pageNum,pageSize);
- return baseMapper.getList(page,taskId,userId,unitId);
+// Page page = new Page<>(pageNum,pageSize);
+ return baseMapper.getList(taskId,userId,unitId);
}
@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
public R addData(NeedProblemClaimDTO item)
{
//任务问题详情
- NeedProblemInventoryDTO inventoryDTO=inventoryService.getDetails(item.getTaskId());
+ NeedProblemInventoryDTO inventoryDTO=inventoryService.getDetails(item.getTaskId(),item.getUserId());
long times=System.currentTimeMillis();
if(times<inventoryDTO.getClaimStartTime().getTime())
{
@@ -57,6 +58,12 @@
{
return R.fail("报名已结束");
}
+
+ if(StringUtils.equals(inventoryDTO.getJoinNum(),inventoryDTO.getClaimNum()))
+ {
+ return R.fail("认领人数已满");
+ }
+
int isJion= baseMapper.getJionNum(item.getTaskId(),item.getUserId());
if(isJion>0)
{
@@ -78,7 +85,13 @@
return R.fail("参与人数已满");
}
}
- return R.ok(baseMapper.addData(item));
+
+ int num=baseMapper.addData(item);
+ if(num!=1)
+ {
+ return R.fail("报名失败");
+ }
+ return R.ok();
}
@Override
@@ -93,11 +106,11 @@
}
@Override
- public R expurgateData(String id)
+ public R expurgateData(String id,String taskId,String userId)
{
//报名信息
- NeedProblemClaimDTO claimDTO=baseMapper.getDetails(id);
- NeedProblemInventoryDTO inventoryDTO=inventoryService.getDetails(claimDTO.getTaskId());
+ NeedProblemClaimDTO claimDTO=baseMapper.getDetails(id,taskId,userId);
+ NeedProblemInventoryDTO inventoryDTO=inventoryService.getDetails(claimDTO.getTaskId(),claimDTO.getUserId());
long times=System.currentTimeMillis();
if(times>inventoryDTO.getNeedStartTime().getTime())
@@ -105,7 +118,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