From 2eea3290641657d2ee13edd90d27f8b2ec01c209 Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期六, 08 五月 2021 18:23:48 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 3 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 65a4968..fc0b95b 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
@@ -10,6 +10,7 @@
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
+import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.service_community.model.dos.ComActActPrizeDO;
import com.panzhihua.service_community.model.dos.ComActDynDO;
@@ -21,6 +22,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -256,6 +258,11 @@
if (R.isOk(r)) {
List<ActivitySignVO> activitySignVOS = JSONArray.parseArray(JSONArray.toJSONString( r.getData()),ActivitySignVO.class);
if (!ObjectUtils.isEmpty(activitySignVOS)) {
+ for (ActivitySignVO signVO:activitySignVOS) {
+ if(StringUtils.isEmpty(signVO.getName())){
+ signVO.setName(signVO.getNickName());
+ }
+ }
List<ActivitySignVO> collect = activitySignVOS.stream().filter(activitySignVO1 -> activitySignVO1.getIsVolunteer() == 1).collect(Collectors.toList());
if (!ObjectUtils.isEmpty(collect)) {
int size = collect.size();
@@ -394,6 +401,17 @@
@PostMapping("pagedynamic")
public R pageDynamic(@RequestBody ComActDynVO comActDynVO) {
return comActDynService.pageDynamic(comActDynVO);
+ }
+
+ /**
+ * 管理后台分页查询社区动态
+ *
+ * @param comActDynVO 查询参数
+ * @return 动态集合
+ */
+ @PostMapping("pagedynamicByAdmin")
+ public R pagedynamicByAdmin(@RequestBody ComActDynVO comActDynVO) {
+ return comActDynService.pageDynamicByAdmin(comActDynVO);
}
/**
@@ -782,6 +800,16 @@
}
/**
+ * 获取志愿者详情
+ * @param id
+ * @return
+ */
+ @GetMapping("getVolunteerById")
+ R getVolunteerById(@RequestParam("id")Long id){
+ return comMngVolunteerMngService.getVolunteerById(id);
+ }
+
+ /**
* 删除志愿者
* @param comMngVolunteerMngVO 手机号
* @return 删除结果
@@ -1092,6 +1120,15 @@
}
/**
+ * 定时任务刷新微心愿的状态
+ * @return 更新结果
+ */
+ @PostMapping("timedtaskactmicrowish")
+ R timedTaskActMicroWishAll(){
+ return comActMicroWishService.timedTaskActMicroWishAll();
+ }
+
+ /**
* 其他建筑详情
* @param id 主键id
* @return 建筑内容
@@ -1334,7 +1371,13 @@
*/
@PostMapping("questnaire/pagequestnaire")
public R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO,@RequestParam("communityId") Long communityId) {
- return comActQuestnaireService.pageQuestnaire(pageQuestnaireDTO,communityId);
+ if(pageQuestnaireDTO.getForParty()==null){
+ pageQuestnaireDTO.setForParty(false);
+ }
+ if(pageQuestnaireDTO.getForVolunteer()==null){
+ pageQuestnaireDTO.setForVolunteer(false);
+ }
+ return comActQuestnaireService.pageQuestnaire(pageQuestnaireDTO, communityId);
}
/**
@@ -1393,7 +1436,7 @@
*
* @param pageQuestnaireSubDetailsDTO 问卷ID
*/
- @GetMapping("questnaire/qaqeustanswerdetails")
+ @PostMapping("questnaire/qaqeustanswerdetails")
public R qaQeustAnswerDetails(@RequestBody PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO){
return comActQuestnaireService.qaQeustDetails(pageQuestnaireSubDetailsDTO);
}
@@ -1403,9 +1446,27 @@
* @param pageQuestnaireAnswerDTO
* @return 分页数据
*/
- @GetMapping("questnaire/pagequestnaireanswer")
+ @PostMapping("questnaire/pagequestnaireanswer")
public R pageQuestnaireAnswer(@RequestBody PageQuestnaireAnswerDTO pageQuestnaireAnswerDTO){
return comActQuestnaireService.pageQuestnaireAnswer(pageQuestnaireAnswerDTO);
}
+ /**
+ * 居民填写问卷调查问卷
+ * @param usersAnswerQuestnaireVO
+ */
+ @PostMapping("questnaire/usersanswequestnaire")
+ public R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO,@RequestParam("userId") Long userId){
+ return comActQuestnaireService.usersAnsweQuestnaire(usersAnswerQuestnaireVO,userId);
+ }
+
+ /**
+ * 删除微心愿
+ * @param id
+ * @return
+ */
+ @PostMapping("deletemicrowish")
+ public R deletemicrowish(@RequestParam("id") Long id){
+ return comActMicroWishService.deleteMicroWish(id);
+ }
}
--
Gitblit v1.7.1