From 94e3a209bb9a31c4ddbd31494bb1628f6fe2e96e Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 12 十月 2022 17:54:49 +0800
Subject: [PATCH] 新增首页工单 办事指南排行榜接口 导办人员排行榜接口 组织排行榜接口 新增办事指南统计接口 导办人员统计接口 组织胖行榜统计接口
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 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 8859f70..daa40d2 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
@@ -1,12 +1,16 @@
package com.panzhihua.applets.api;
import java.util.Date;
+import java.util.List;
import javax.annotation.Resource;
+import javax.validation.Valid;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerOrgTeamDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerServiceTypeDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerSkillDto;
+import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
+import com.panzhihua.common.model.dtos.community.PageActivityInviteDTO;
import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.common.ComMngVolunteerOrgTeamVo;
@@ -20,6 +24,7 @@
import io.swagger.annotations.*;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
@@ -50,6 +55,7 @@
import lombok.extern.slf4j.Slf4j;
import static java.util.Objects.isNull;
+import static org.apache.commons.lang3.ObjectUtils.isEmpty;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -91,7 +97,6 @@
}
comActDynVO.setIsTopping(null);
comActDynVO.setStatus(1);
- comActDynVO.setAreaCode(this.getAreaCode());
Integer category = comActDynVO.getCategory();
if (isNull(category)) {
comActDynVO.setCategory(1);
@@ -164,7 +169,6 @@
public R activitySignIn(@RequestBody ComActActRegistVO comActActRegistVO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
comActActRegistVO.setUserId(loginUserInfo.getUserId());
- comActActRegistVO.setIsVolunteer(loginUserInfo.getIsVolunteer());
return communityService.activitySignIn(comActActRegistVO);
}
@@ -173,7 +177,6 @@
public R activityEvaluate(@RequestBody ComActActEvaluateVO comActActEvaluateVO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
comActActEvaluateVO.setUserId(loginUserInfo.getUserId());
- comActActEvaluateVO.setIsVolunteer(loginUserInfo.getIsVolunteer());
return communityService.activityEvaluate(comActActEvaluateVO);
}
@@ -260,6 +263,31 @@
return communityService.listRegistRecord(id, userId);
}
return R.fail("type不存在");
+ }
+
+ @ApiOperation(value = "活动邀请列表", response = ActivityInviteVO.class)
+ @PostMapping("activity/invite/list")
+ public R pageActivityInviteList(@RequestBody @Valid PageActivityInviteDTO pageActivityInviteDTO) {
+ return communityService.pageActivityInviteList(pageActivityInviteDTO);
+ }
+
+ @ApiOperation(value = "添加邀请人员")
+ @PostMapping("activity/invite/add")
+ public R activityInviteAdd(@RequestBody @Valid List<ActivityInviteDTO> list) {
+ if (!isEmpty(list)) {
+ list.forEach(e -> e.setCreatedBy(this.getUserId()));
+ } else {
+ return R.fail("列表为空");
+ }
+ return communityService.activityInviteAdd(list);
+ }
+
+
+ @ApiOperation(value = "删除邀请人员")
+ @ApiImplicitParam(name = "id", value = "邀请主键id", required = true)
+ @DeleteMapping("activity/invite/delete")
+ public R activityInviteDelete(@RequestParam("id") Long id) {
+ return communityService.activityInviteDelete(id);
}
// @ApiOperation(value = "新增社区动态浏览记录")
@@ -404,7 +432,7 @@
@RequestParam(value = "size",required = false) Integer size,
@RequestParam(value = "belongTo",required = false) String belongTo,
@RequestParam(value = "unitId",required = false) Long unitId){
- return communityService.institutionalUnitServiceAnalysis(year,type,range,communityId,page,size,belongTo,unitId);
+ return communityService.institutionalUnitServiceAnalysis(year,type,range,communityId,page,size,belongTo,unitId,this.getLoginUserInfo().getAccount());
}
--
Gitblit v1.7.1