From 9b8a37d4beecb1d95cd0863d8ebda29e6624f950 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 05 七月 2022 13:41:02 +0800
Subject: [PATCH] update
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 b553ba3..1b2ffa3 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
@@ -11,6 +11,7 @@
import com.panzhihua.common.model.vos.common.ComMngVolunteerServiceTypeVo;
import com.panzhihua.common.model.vos.common.ComMngVolunteerSkillVo;
import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.neighbor.ActivityAnalysisVO;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -119,7 +120,6 @@
comActActivityVO.setCommunityId(loginUserInfo.getCommunityId());
}
comActActivityVO.setIsApplets(1);
- comActActivityVO.setAreaCode(this.getAreaCode());
Integer status = comActActivityVO.getStatus();
if (null != status && status.intValue() == 4) {
comActActivityVO.setIsIng(1);
@@ -356,4 +356,21 @@
}
return communityService.listActivitySign(activitySignVO);
}
+ @ApiOperation(value = "新增服务活动")
+ @PostMapping("activity")
+ public R addActivity(@RequestBody @Validated(AddGroup.class) ComActActivityVO comActActivityVO) {
+ Long communityId = this.getCommunityId();
+ comActActivityVO.setCommunityId(communityId);
+ comActActivityVO.setUserId(this.getLoginUserInfo().getUserId());
+ comActActivityVO.setStatus(2);
+ comActActivityVO.setHasPrize(0);
+ return communityService.addActivity(comActActivityVO);
+ }
+ @ApiOperation(value = "单位活动统计",response = ActivityAnalysisVO.class)
+ @GetMapping("activity/analysis")
+ public R activityUnitAnalysis(@RequestParam(value = "year",required = false) Integer year, @RequestParam(value = "type",required = false) Integer type,
+ @RequestParam(value = "range",required = false)Integer range,@RequestParam(value = "communityId",required = false) Long communityId){
+ return communityService.institutionalUnitServiceAnalysis(year,type,range,communityId);
+ }
+
}
--
Gitblit v1.7.1