From 8e415f36a8208ac988dad3ceef3225780850b82c Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期日, 24 一月 2021 09:27:29 +0800
Subject: [PATCH] 一起议
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
index a39812f..f3bb9b7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
@@ -3,12 +3,15 @@
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO;
+import com.panzhihua.common.model.dtos.partybuilding.ComPbActivityDTO;
+import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -142,7 +145,41 @@
return r;
}
+ @ApiOperation(value = "创建党员活动")
+ @PostMapping("activityinfo")
+ public R addActivityinfo(@RequestBody @Validated(AddGroup.class) ComPbActivityDTO comPbActivityDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long userId = loginUserInfo.getUserId();
+ Long communityId = loginUserInfo.getCommunityId();
+ comPbActivityDTO.setCreateBy(userId);
+ comPbActivityDTO.setCommunityId(communityId);
+ Date date=new Date();
+ comPbActivityDTO.setReleaseTime(date);
+ Date activityTimeBegin = comPbActivityDTO.getActivityTimeBegin();
+ Date activityTimeEnd = comPbActivityDTO.getActivityTimeEnd();
+ boolean before = activityTimeEnd.before(activityTimeBegin);
+ if (before) {
+ return R.fail("活动结束时间不能早于开始时间");
+ }
+// 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消
+ int status=2;
+ Date enrollTimeBegin = comPbActivityDTO.getEnrollTimeBegin();
+ Date enrollTimeEnd = comPbActivityDTO.getEnrollTimeEnd();
+ if (enrollTimeEnd.before(enrollTimeBegin)) {
+ return R.fail("报名结束时间不能早于报名开始时间");
+ }
+ if (enrollTimeBegin.before(date)) {
+ status=3;
+ }
+ comPbActivityDTO.setStatus(status);
+ return partyBuildingService.addActivityApplets(comPbActivityDTO);
+ }
-
+ @ApiOperation(value = "分页查询服务团队成员",response = ComPbServiceTeamVO.class)
+ @PostMapping("pageserviceteam")
+ public R pageServiceTeam(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO) {
+ pageComPbServiceTeamDTO.setCommunityId(this.getCommunityId());
+ return partyBuildingService.pageServiceTeam(pageComPbServiceTeamDTO);
+ }
}
--
Gitblit v1.7.1