From 947c4e68b6ce3b64db967a689227315924dd181e Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 22 Feb 2024 16:31:08 +0800
Subject: [PATCH] 投票人员查询优化
---
src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java b/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java
index 6c90b81..3517b07 100644
--- a/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java
@@ -25,6 +25,7 @@
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.Nullable;
import org.springblade.common.constant.CommonConstant;
+import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.discuss.entity.PublicDiscussEntity;
@@ -36,12 +37,15 @@
import org.springblade.modules.discuss.service.IUserTopicsService;
import org.springblade.modules.discuss.vo.TopicsVO;
import org.springblade.modules.discuss.vo.UserTopicsVO;
+import org.springblade.modules.district.entity.DistrictEntity;
+import org.springblade.modules.district.service.IDistrictService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 用户议题报表 服务实现类
@@ -56,6 +60,17 @@
@Override
public IPage<UserTopicsVO> selectUserTopicsPage(IPage<UserTopicsVO> page, UserTopicsVO userTopics) {
+ if (StringUtils.isNotBlank(userTopics.getDistrictId())) {
+ List<String> longs = JSON.parseArray(userTopics.getDistrictId()).toJavaList(String.class);
+ IDistrictService bean = SpringUtils.getBean(IDistrictService.class);
+ List<DistrictEntity> list = bean.list(Wrappers.<DistrictEntity>lambdaQuery().in(DistrictEntity::getId, longs));
+ List<String> collect = list.stream().map(item ->
+ item.getAoiCode()
+ ).collect(Collectors.toList());
+ if (collect != null) {
+ userTopics.setAoiCodeList(collect);
+ }
+ }
return page.setRecords(baseMapper.selectUserTopicsPage(page, userTopics));
}
@@ -68,13 +83,17 @@
PublicDiscussEntity one = bean.getOne(Wrappers.<PublicDiscussEntity>lambdaQuery().eq(PublicDiscussEntity::getArticleId, topics.get(0).getArticleId()));
// 一户一票
if (one.getVoteRestrictions().equals(CommonConstant.NUMBER_ONE)) {
- long count = count(Wrappers.<UserTopicsEntity>lambdaQuery().eq(UserTopicsEntity::getHouseCode, topics.get(0).getHouseCode()));
+ long count = count(Wrappers.<UserTopicsEntity>lambdaQuery()
+ .eq(UserTopicsEntity::getHouseCode, topics.get(0).getHouseCode())
+ .eq(UserTopicsEntity::getArticleId,topics.get(0).getArticleId()));
if (count > 1) {
throw new Exception("您的房屋已投票，不能重复投票！");
}
} else {
//
- long count = count(Wrappers.<UserTopicsEntity>lambdaQuery().eq(UserTopicsEntity::getUserId, AuthUtil.getUserId()));
+ long count = count(Wrappers.<UserTopicsEntity>lambdaQuery()
+ .eq(UserTopicsEntity::getUserId, AuthUtil.getUserId())
+ .eq(UserTopicsEntity::getArticleId,topics.get(0).getArticleId()));
if (count > 1) {
throw new Exception("您的已投票，不能重复投票！");
}
--
Gitblit v1.9.3