From 43f0578e80af82ecae6c61b51bd0539c6b960603 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期二, 16 八月 2022 19:08:32 +0800
Subject: [PATCH] 服务范围优化
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 111 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index 4941a19..850afc5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -8,6 +8,10 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
+import com.panzhihua.common.model.dtos.community.PageActivityInviteDTO;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
import com.panzhihua.common.model.vos.community.volunteer.ComMngVolunteerExcelVO;
import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
@@ -145,6 +149,8 @@
private ComActMicroWishOperationRecordService wishOperationRecordService;
@Resource
private ComActActEvaluateDAO comActActEvaluateDAO;
+ @Resource
+ private ComActActivityInviteService comActActivityInviteService;
/**
* 新增社区活动
@@ -351,6 +357,7 @@
});
comActActivityVO.setComActActPrizeVOList(comActActPrizeVOS);
}
+ //
//活动评价
IPage<ComActActEvaluateVO> comActActEvaluatePage = comActActEvaluateDAO.getEvaluateListPage(new Page(pageNum,pageSize),id);
comActActivityVO.setComActActEvaluateVOList(comActActEvaluatePage.getRecords());
@@ -404,7 +411,7 @@
}
}
List<ActivitySignVO> collect = activitySignVOS.stream()
- .filter(activitySignVO1 -> activitySignVO1.getIsVolunteer() == 1).collect(toList());
+ .filter(activitySignVO1 -> activitySignVO1.getSignIdentity() == 3).collect(toList());
if (!ObjectUtils.isEmpty(collect)) {
int size = collect.size();
if (size >= 6) {
@@ -414,13 +421,23 @@
}
}
List<ActivitySignVO> collect1 = activitySignVOS.stream()
- .filter(activitySignVO1 -> activitySignVO1.getIsVolunteer() == 0).collect(toList());
+ .filter(activitySignVO1 -> activitySignVO1.getSignIdentity() == 1).collect(toList());
if (!ObjectUtils.isEmpty(collect1)) {
int size = collect1.size();
if (size >= 6) {
comActActivityVO.setActivitySignVOList(collect1.subList(0, 6));
} else {
comActActivityVO.setActivitySignVOList(collect1);
+ }
+ }
+ List<ActivitySignVO> collect2 = activitySignVOS.stream()
+ .filter(activitySignVO1 -> activitySignVO1.getSignIdentity() == 2).collect(toList());
+ if (!ObjectUtils.isEmpty(collect2)) {
+ int size = collect2.size();
+ if (size >= 6) {
+ comActActivityVO.setActivityPbList(collect2.subList(0, 6));
+ } else {
+ comActActivityVO.setActivityPbList(collect2);
}
}
}
@@ -1192,8 +1209,8 @@
* @return 类型列表
*/
@PostMapping("listbuildtype")
- public R listBuildType() {
- return comMngStructOtherBuildService.listBuildType();
+ public R listBuildType(@RequestParam("communityId")Long communityId) {
+ return comMngStructOtherBuildService.listBuildType(communityId);
}
/**
@@ -1217,6 +1234,15 @@
*/
@PostMapping("addvolunteer")
R addVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO) {
+ Long submitUserId = comMngVolunteerMngVO.getSubmitUserId();
+ if (Objects.nonNull(submitUserId)) {
+ //获取小程序用户信息
+ R<LoginUserInfoVO> userInfoR = userService.getUserInfoByUserId(submitUserId.toString());
+ LoginUserInfoVO userInfo = userInfoR.getData();
+ if (Objects.nonNull(userInfo)) {
+ comMngVolunteerMngVO.setIdCard(userInfo.getIdCard());
+ }
+ }
return comMngVolunteerMngService.addVolunteer(comMngVolunteerMngVO);
}
@@ -2233,7 +2259,7 @@
try {
WxXCXTempSend util = new WxXCXTempSend();
R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(eldersAuthFeedbackAddDTO.getAreaCode(),5);
- String accessToken = util.getAppAccessToken();
+ String accessToken = util.getAccessToken();
WxUtil.sendSubscribeRZSH(openid, accessToken, "高龄认证",
DateUtils.format(eldersAuthDO.getCreateAt(), DateUtils.ymdhms_format),
eldersAuthFeedbackAddDTO.getFeedBack(),sysTemplateConfigVO.getData().getTemplateId());
@@ -2308,7 +2334,7 @@
* @return 社区列表
*/
@GetMapping("/eventgrid/community/westList")
- public R getWestCommunityLists(@RequestParam("areaCode")String areaCode) {
+ public R getWestCommunityLists(@RequestParam(value = "areaCode",required = false)String areaCode) {
return comActService.getWestCommunityLists(areaCode);
}
@@ -2573,4 +2599,83 @@
public R partyMemberCount(@RequestParam("communityId")Long communityId,@RequestParam("year")String year){
return comActActivityService.partyMemberCount(communityId,year);
}
+
+ /**
+ * 党员活动详情数据
+ * @return
+ */
+ @PostMapping("activity/partyMemberDetail")
+ public R partyMemberDetail(@RequestBody CommonPage commonPage){
+ return comActActivityService.partyMemberDetail(commonPage);
+ }
+
+
+ /**
+ * 导出党员活动详情数据
+ * @return
+ */
+ @PostMapping("activity/exportPartyMemberDetail")
+ public R exportPartyMemberDetail(@RequestBody CommonPage commonPage){
+ return comActActivityService.exportPartyMemberDetail(commonPage);
+ }
+
+ /**
+ * 批量删除活动
+ * @param ids
+ * @return
+ */
+ @PostMapping("batchDel")
+ public R deleteActivities(@RequestBody List<Long> ids) {
+ return R.ok(comActActivityService.removeByIds(ids));
+ }
+
+ /**
+ * 获取人大代表反馈记录
+ * @param id
+ * @return
+ */
+ @GetMapping("dpc/feedback")
+ public R getFeedbackList(@RequestParam("id") Long id) {
+ return comActEasyPhotoService.getFeedbackList(id);
+ }
+
+ /**
+ * 人大代表反馈随手拍
+ * @param comActEasyPhotoVO
+ * @return
+ */
+ @PostMapping("dpc/feedback")
+ public R addEasyPhotoFeedbackForDpc(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
+ return comActEasyPhotoService.addEasyPhotoFeedbackForDpc(comActEasyPhotoVO);
+ }
+
+ /**
+ * 活动邀请列表
+ * @param pageActivityInviteDTO
+ * @return
+ */
+ @PostMapping("activity/invite/list")
+ public R pageActivityInviteList(@RequestBody PageActivityInviteDTO pageActivityInviteDTO) {
+ return comActActivityInviteService.pageActivityInviteList(pageActivityInviteDTO);
+ }
+
+ /**
+ * 添加邀请人员
+ * @param list
+ * @return
+ */
+ @PostMapping("activity/invite/add")
+ public R activityInviteAdd(@RequestBody List<ActivityInviteDTO> list) {
+ return comActActivityInviteService.activityInviteAdd(list);
+ }
+
+ /**
+ * 删除邀请人员
+ * @param id
+ * @return
+ */
+ @DeleteMapping("activity/invite/delete")
+ public R activityInviteDelete(@RequestParam("id") Long id) {
+ return comActActivityInviteService.activityInviteDelete(id);
+ }
}
--
Gitblit v1.7.1