From 931ea9dcdf62ea348f1811b9faf95d07ab1c1ac8 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期日, 26 九月 2021 14:22:22 +0800
Subject: [PATCH] Merge branch 'test' into 'test_bak'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
index 6ecb423..3d63ca2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -4,6 +4,7 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -43,6 +44,11 @@
@PostMapping("pagearea")
public R pageArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO) {
return communityService.pageArea(comMngStructAreaVO);
+ }
+ @ApiOperation(value = "新分页查询小区", response = ComMngVillageVO.class)
+ @PostMapping("pagevillage")
+ public R pageVillage(@RequestBody PageComMngVillageDTO pageComMngVillageDTO) {
+ return communityService.pageVillage(pageComMngVillageDTO);
}
@ApiOperation(value = "分页获取社区动态", response = ComActDynVO.class)
@@ -108,7 +114,31 @@
if (loginUserInfo != null) {
userId = loginUserInfo.getUserId();
}
- return communityService.detailActivity(id, userId);
+ return communityService.detailActivity(id, userId,null,null);
+ }
+
+ @ApiOperation(value = "分页查询活动评价记录", response = ComActActEvaluateVO.class)
+ @PostMapping("evaluate/page")
+ public R pageActivityEvaluates(@RequestBody ComActActEvaluateVO comActActEvaluateVO) {
+ return communityService.pageActivityEvaluates(comActActEvaluateVO);
+ }
+
+ @ApiOperation(value = "社区活动/志愿者活动签到")
+ @PostMapping("activity/sign-in")
+ public R activitySignIn(@RequestBody ComActActRegistVO comActActRegistVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ comActActRegistVO.setUserId(loginUserInfo.getUserId());
+ comActActRegistVO.setIsVolunteer(loginUserInfo.getIsVolunteer());
+ return communityService.activitySignIn(comActActRegistVO);
+ }
+
+ @ApiOperation(value = "社区活动/志愿者活动评价")
+ @PostMapping("activity/evaluate")
+ public R activityEvaluate(@RequestBody ComActActEvaluateVO comActActEvaluateVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ comActActEvaluateVO.setUserId(loginUserInfo.getUserId());
+ comActActEvaluateVO.setIsVolunteer(loginUserInfo.getIsVolunteer());
+ return communityService.activityEvaluate(comActActEvaluateVO);
}
@ApiOperation(value = "报名/取消报名社区活动")
@@ -120,7 +150,7 @@
signactivityVO.setUserId(userId);
R r = communityService.signActivity(signactivityVO);
if (R.isOk(r) && signactivityVO.getType().intValue() == 1) {
- R r2 = communityService.detailActivity(activityId, userId);
+ R r2 = communityService.detailActivity(activityId, userId,null,null);
ComActActivityVO comActActivityVO =
JSONObject.parseObject(JSONObject.toJSONString(r2.getData()), ComActActivityVO.class);
SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
--
Gitblit v1.7.1