From 4ad4b51a4fb177eafee8a3a355496e7b6c1be662 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 11 七月 2024 16:24:46 +0800
Subject: [PATCH] 花城 小程序签退打卡获取积分详情报错2
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemClaimApi.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
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 5b9a3b0..fe35d22 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
@@ -1,8 +1,10 @@
package com.panzhihua.service_dangjian.api;
import com.panzhihua.common.model.dtos.partybuilding.NeedProblemClaimDTO;
+import com.panzhihua.common.model.dtos.partybuilding.NeedProblemInventoryDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_dangjian.service.NeedProblemClaimService;
+import com.panzhihua.service_dangjian.service.NeedProblemInventoryService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -16,20 +18,26 @@
@Resource
private NeedProblemClaimService claimService;
+
+ //任务 问题接口
+ @Resource
+ private NeedProblemInventoryService inventoryService;
+
@GetMapping("/getNeedClaimList")
- public R getNeedClaimList(@RequestParam("pageNum") int pageNum,
- @RequestParam("pageSize") int pageSize,
- @RequestParam(value = "kind", required = false) String kind,
+ public R getNeedClaimList(
+ @RequestParam(value = "taskId", required = false) String taskId,
@RequestParam(value = "userId", required = false) String userId,
@RequestParam(value = "unitId", required = false) String unitId)
{
- return R.ok(claimService.getList(pageNum,pageSize,kind,userId,unitId));
+ return R.ok(claimService.getList(taskId,userId,unitId));
}
@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")
@@ -45,9 +53,11 @@
}
@DeleteMapping("/expurgateNeedClaimData")
- public R expurgateNeedClaimData(@RequestParam("id") String id)
+ public R expurgateNeedClaimData(@RequestParam(value = "id", required = false) String id,
+ @RequestParam(value = "taskId", required = false) String taskId,
+ @RequestParam(value = "userId", required = false) String userId)
{
- return claimService.expurgateData(id);
+ return claimService.expurgateData(id,taskId,userId);
}
@@ -56,6 +66,13 @@
@RequestParam("userId") String userId,
@RequestParam("type") String type)
{
+ NeedProblemInventoryDTO inventoryDTO=inventoryService.getDetails(taskId,userId);
+ long times=System.currentTimeMillis();
+ if(times<inventoryDTO.getNeedStartTime().getTime())
+ {
+ return R.fail("任务未开始");
+ }
+
return R.ok(claimService.needClaimSignIn(taskId,userId,type));
}
--
Gitblit v1.7.1