From c49340174f646c4de19fcf2bbf52fcbc154ef76f Mon Sep 17 00:00:00 2001
From: infrasys00 <blackdancers@163.com>
Date: 星期二, 22 十二月 2020 17:21:50 +0800
Subject: [PATCH] common
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 fa65602..884b264 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
@@ -3,15 +3,14 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ActivitySignVO;
-import com.panzhihua.common.model.vos.community.ComActActivityVO;
-import com.panzhihua.common.model.vos.community.ComActDynVO;
-import com.panzhihua.common.model.vos.community.SignactivityVO;
+import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -34,6 +33,8 @@
public R pageDynamic(@RequestBody ComActDynVO comActDynVO){
Long communityId = this.getCommunityId();
comActDynVO.setCommunityId(communityId);
+ comActDynVO.setIsTopping(null);
+ comActDynVO.setStatus(null);
return communityService.pageDynamic(comActDynVO);
}
@@ -81,12 +82,20 @@
@PostMapping("dynamicuser")
public R addDynamicUser(@RequestBody ComActDynVO comActDynVO){
Long id = comActDynVO.getId();
- if (ObjectUtils.isEmpty(id)||id==0) {
+ if (null==id||id==0) {
return R.fail("社区动态不存在");
}
Long userId = this.getUserId();
return communityService.addDynamicUser(id,userId);
}
+ @ApiOperation(value = "志愿者申请")
+ @PostMapping("volunteer")
+ public R addVolunteer(@RequestBody @Validated(AddGroup.class) ComMngVolunteerMngVO comMngVolunteerMngVO){
+ comMngVolunteerMngVO.setState(1);
+ return communityService.addVolunteer(comMngVolunteerMngVO);
+ }
+
}
+
--
Gitblit v1.7.1