From de91c84954157bb9f8b6d938cbe0b1b51fb6e65d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 07 五月 2021 15:23:57 +0800
Subject: [PATCH] bugfixed：新增便民服务商家 报错
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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 591aab5..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
@@ -22,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;
@@ -257,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();
@@ -1114,6 +1120,15 @@
}
/**
+ * 定时任务刷新微心愿的状态
+ * @return 更新结果
+ */
+ @PostMapping("timedtaskactmicrowish")
+ R timedTaskActMicroWishAll(){
+ return comActMicroWishService.timedTaskActMicroWishAll();
+ }
+
+ /**
* 其他建筑详情
* @param id 主键id
* @return 建筑内容
@@ -1450,7 +1465,7 @@
* @param id
* @return
*/
- @GetMapping("deletemicrowish")
+ @PostMapping("deletemicrowish")
public R deletemicrowish(@RequestParam("id") Long id){
return comActMicroWishService.deleteMicroWish(id);
}
--
Gitblit v1.7.1