From 1f84200cf1b608d1c2f97b3329d3a255194263cf Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 18 八月 2022 17:59:55 +0800
Subject: [PATCH] 议事投票&防疫后台优化
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
index 6078cc6..7b27076 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
@@ -6,7 +6,9 @@
import javax.annotation.Resource;
import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
+import com.panzhihua.common.model.dtos.community.ComActDiscussVoteOptionDTO;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -200,21 +202,19 @@
@ApiOperation(value = "一起议-投票")
@PostMapping("discussoptionuser")
public R addDiscussOptionUser(@RequestBody @Valid DiscussVoteOptionDTO discussVoteOptionDTO) {
- List<Long> optionIds = discussVoteOptionDTO.getOptionIds();
- if (optionIds.isEmpty()) {
- return R.fail("选项主键不能为空");
+ List<ComActDiscussVoteOptionDTO> options = discussVoteOptionDTO.getOptions();
+ if (options.isEmpty()) {
+ return R.fail("选项内容不能为空");
}
- ComActDiscussOptionUserDTO comActDiscussOptionUserDTO = new ComActDiscussOptionUserDTO();
- comActDiscussOptionUserDTO.setDiscussOptionIds(optionIds);
- comActDiscussOptionUserDTO.setUserId(this.getUserId());
- optionIds.forEach(optionId -> {
+ discussVoteOptionDTO.setUserId(this.getUserId());
+ options.forEach(option -> {
// 议事投票计算积分
- AddComActIntegralUserDTO integralUserDTO = new AddComActIntegralUserDTO(optionId,
+ AddComActIntegralUserDTO integralUserDTO = new AddComActIntegralUserDTO(option.getId(),
AddComActIntegralUserDTO.integralType.cyystp, this.getCommunityId(), this.getUserId());
integralUserDTO.setIsComment(2);
communityService.addIntegralTradeAdmin(integralUserDTO);
});
- return communityService.addDiscussOptionUser(comActDiscussOptionUserDTO);
+ return communityService.addDiscussOptionUser(discussVoteOptionDTO);
}
@ApiOperation(value = "一起议-增加浏览量")
--
Gitblit v1.7.1