From 8c0b5b30e5200e7bd45aa34507c3623e17fcce91 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 24 八月 2023 13:47:24 +0800
Subject: [PATCH] 新增小程序积分列表 修改积分发放流程
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java
index d39ef72..970ce5e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java
@@ -9,6 +9,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.Date;
@Slf4j
@RestController
@@ -47,7 +48,7 @@
{
return R.fail("活动id不能为空");
}
-
+getLoginUserInfo()
if(StringUtils.isEmpty(communityId))
{
communityId=getLoginUserInfo().getCommunityId()+"";
@@ -69,14 +70,14 @@
return R.fail("参数不能为空");
}
+ if(StringUtils.isEmpty(volunteerActivitiesPeopleVO.getUserId()))
+ {
+ return R.fail("用户id不能为空");
+ }
+
if(StringUtils.isEmpty(volunteerActivitiesPeopleVO.getActivityId()))
{
return R.fail("活动id不能为空");
- }
-
- if(StringUtils.isEmpty(volunteerActivitiesPeopleVO.getVolunteerId()))
- {
- return R.fail("志愿者id不能为空");
}
if(StringUtils.isEmpty(volunteerActivitiesPeopleVO.getCommunityId()))
@@ -137,5 +138,38 @@
}
return volunteerActivitiesPeople.vapDelete(id);
}
+
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/queryList")
+ R queryList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "name", required = false) String name,
+ @RequestParam(value = "acState", required = false) String acState,
+ @RequestParam(value = "acType", required = false) String acType,
+ @RequestParam(value = "actityBeginTime", required = false) Date actityBeginTime,
+ @RequestParam(value = "actityEndTime", required = false) Date actityEndTime)
+ {
+ return volunteerActivitiesPeople.volunteerQueryList(pageNum, pageSize, name, acState, acType, actityBeginTime, actityEndTime);
+ }
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/volunteerTypeGetList")
+ public R volunteerTypeGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize)
+ {
+ return volunteerActivitiesPeople.volunteerTypeGetList(pageNum,pageSize);
+ }
+
+
+
}
--
Gitblit v1.7.1