From ccd28a0c35e8fff74da6ef63042fb8a896d78f7f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 29 六月 2022 09:45:52 +0800
Subject: [PATCH] 单位服务统计
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 105 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 89 insertions(+), 16 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 abca450..678af6c 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,25 +4,39 @@
import javax.annotation.Resource;
-import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
-import com.panzhihua.common.service.partybuilding.PartyBuildingService;
+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.vos.common.ComMngVolunteerOrgTeamVo;
+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.ComActNeighborCircleAnalysisVO;
+import io.swagger.annotations.*;
+import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO;
+import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
import com.panzhihua.common.model.dtos.community.PageVolunteerDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.common.validated.PageGroup;
-import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
/**
@@ -63,6 +77,7 @@
}
comActDynVO.setIsTopping(null);
comActDynVO.setStatus(1);
+ comActDynVO.setAreaCode(this.getAreaCode());
return communityService.pageDynamic(comActDynVO);
}
@@ -144,18 +159,24 @@
return communityService.activityEvaluate(comActActEvaluateVO);
}
+ @ApiOperation(value = "我的评价", response = MyActivityEvaluateVO.class)
+ @GetMapping("activity/my-evaluate")
+ public R listMyActivityEvaluate(@RequestParam("activityId") Long activityId) {
+ return communityService.listMyActivityEvaluate(getUserId(), activityId);
+ }
+
@ApiOperation(value = "报名/取消报名社区活动")
@PutMapping("signactivity")
public R signActivity(@RequestBody @Validated(AddGroup.class) SignactivityVO signactivityVO) {
Long userId = this.getUserId();
Long activityId = signactivityVO.getActivityId();
- Integer isVolunteer = signactivityVO.getIsVolunteer();
signactivityVO.setUserId(userId);
R r = communityService.signActivity(signactivityVO);
if (R.isOk(r) && signactivityVO.getType().intValue() == 1) {
R r2 = communityService.detailActivity(activityId, userId,null,null);
ComActActivityVO comActActivityVO =
JSONObject.parseObject(JSONObject.toJSONString(r2.getData()), ComActActivityVO.class);
+ Integer isVolunteer = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), Integer.class);
SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
sysUserNoticeVO.setUserId(userId);
sysUserNoticeVO.setType(1);
@@ -166,7 +187,7 @@
sysUserNoticeVO.setBusinessContent(String.format("活动将于%tF %tT 开始，请按时参加", beginAt, beginAt));
sysUserNoticeVO.setBusinessId(activityId);
sysUserNoticeVO.setStatus(0);
- sysUserNoticeVO.setActivityType(isVolunteer.intValue() == 1 ? 1 : 2);
+ sysUserNoticeVO.setActivityType(comActActivityVO.getType());
sysUserNoticeVO.setBusinessStatus(2);
R r1 = userService.addNotice(sysUserNoticeVO);
if (R.isOk(r1)) {
@@ -187,7 +208,7 @@
return R.fail("人员类型错误");
}
activitySignVO.setType(type);
- return communityService.listActivitySigns(activitySignVO);
+ return communityService.listActivitySign(activitySignVO);
}
@ApiOperation(value = "活动报名签到情况", response = ActivitySignInRecordVO.class)
@@ -203,14 +224,13 @@
}
if (type.intValue() == 1) {
return communityService.listSignInRecord(id);
- } else {
- return partyBuildingService.listSignInRecord(id);
}
+ return R.fail("type不存在");
}
@ApiOperation(value = "活动签到记录", response = ComActActRegistVO.class)
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "社区活动主键", required = true),
+ @ApiImplicitParam(name = "id", value = "活动主键", required = true),
@ApiImplicitParam(name = "type", value = "活动类型，1.居民/志愿者活动 2.党员活动", required = true),
@ApiImplicitParam(name = "userId", value = "用户id", required = true)
})
@@ -220,9 +240,8 @@
@RequestParam("userId") Long userId) {
if (type.intValue() == 1) {
return communityService.listRegistRecord(id, userId);
- } else {
- return partyBuildingService.listRegistRecord(id, userId);
}
+ return R.fail("type不存在");
}
// @ApiOperation(value = "新增社区动态浏览记录")
@@ -252,10 +271,9 @@
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
if (loginUserInfo != null) {
comMngVolunteerMngVO.setCommunityId(loginUserInfo.getCommunityId());
+ }else{
+ comMngVolunteerMngVO.setCommunityId(pageVolunteerDTO.getCommunityId());
}
- // Long communityId = this.getCommunityId();
-
- // comMngVolunteerMngVO.setCommunityId(communityId);
comMngVolunteerMngVO.setPageNum(pageVolunteerDTO.getPageNum());
comMngVolunteerMngVO.setPageSize(pageVolunteerDTO.getPageSize());
return communityService.pageVolunteer(comMngVolunteerMngVO);
@@ -265,6 +283,31 @@
@GetMapping("volunteer")
public R detailVolunteer(@RequestParam("id") Long id) {
return communityService.detailVolunteer(id);
+ }
+
+ @ApiOperation(value = "查询志愿者组织列表", response = ComMngVolunteerOrgTeamVo.class)
+ @GetMapping("/volunteer/org/list")
+ public R listVolunteerOrgAdmin() {
+ PageComMngVolunteerOrgTeamDto orgTeamDto = new PageComMngVolunteerOrgTeamDto();
+ orgTeamDto.setParentId(0L);
+ orgTeamDto.setCommunityId(this.getCommunityId());
+ return communityService.listVolunteerOrgAdmin(orgTeamDto);
+ }
+
+ @ApiOperation(value = "查询志愿者服务类型列表", response = ComMngVolunteerServiceTypeVo.class)
+ @GetMapping("/volunteer/service/type/list")
+ public R listVolunteerServiceTypeAdmin() {
+ PageComMngVolunteerServiceTypeDto serviceTypeDto = new PageComMngVolunteerServiceTypeDto();
+ serviceTypeDto.setCommunityId(this.getCommunityId());
+ return communityService.listServiceTypeAdmin(serviceTypeDto);
+ }
+
+ @ApiOperation(value = "查询志愿者技能列表", response = ComMngVolunteerSkillVo.class)
+ @GetMapping("/volunteer/skill/list")
+ public R listVolunteerSkillAdmin() {
+ PageComMngVolunteerSkillDto volunteerSkillDto = new PageComMngVolunteerSkillDto();
+ volunteerSkillDto.setCommunityId(this.getCommunityId());
+ return communityService.listVolunteerSkillAdmin(volunteerSkillDto);
}
@ApiOperation(value = "车辆登记")
@@ -295,4 +338,34 @@
required = true) @RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
return communityService.getCityTreeByProvinceCode(provinceAdcode);
}
+ @ApiOperation(value = "社区详情", response = ComActVO.class)
+ @GetMapping("community")
+ public R detailCommunity() {
+ return communityService.detailCommunity(this.getCommunityId());
+ }
+
+ @ApiOperation(value = "查询活动报名名单集合",response = ActivitySignVO.class)
+ @PostMapping("listactivitysign")
+ public R listActivitySign(@RequestBody ActivitySignVO activitySignVO) {
+ if (ObjectUtils.isEmpty(activitySignVO.getActivityId())) {
+ return R.fail("活动id主键不能为空");
+ }
+ 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 = ComActNeighborCircleAnalysisVO.class)
+ @GetMapping("activity/unit/analysis")
+ public R activityUnitAnalysis(@RequestParam(value = "year") Integer year,@RequestParam("communityId") Long communityId ){
+ return communityService.institutionalUnitServiceAnalysis(year,communityId);
+ }
}
--
Gitblit v1.7.1