From f917fc4d42481ea072bef864ace63d9572b89bb5 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 25 八月 2021 16:14:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
index b91f7cd..edc6609 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -5,6 +5,9 @@
import javax.annotation.Resource;
+import com.panzhihua.service_community.dao.ComActActEvaluateDAO;
+import com.panzhihua.service_community.dao.ComActActRegistDAO;
+import com.panzhihua.service_community.model.dos.ComActActEvaluateDO;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -50,6 +53,10 @@
private ComActActSignDAO comActActSignDAO;
@Resource
private UserService userService;
+ @Resource
+ private ComActActEvaluateDAO comActActEvaluateDAO;
+ @Resource
+ private ComActActRegistDAO comActActRegistDAO;
/**
* 新增社区活动
@@ -263,6 +270,24 @@
public R listActivitySigns(ActivitySignVO activitySignVO) {
List<ActivitySignVO> activitySignVOS = comActActSignDAO.listActivitySigns(activitySignVO);
return R.ok(activitySignVOS);
+ }
+
+ @Override
+ public R pageActivityEvaluates(ComActActEvaluateVO comActActEvaluateVO) {
+ IPage<ComActActEvaluateVO> comActActEvaluateVOIPage = comActActEvaluateDAO
+ .pageActivityEvaluates(new Page(comActActEvaluateVO.getPageNum(), comActActEvaluateVO.getPageSize()), comActActEvaluateVO);
+ return R.ok(comActActEvaluateVOIPage);
+ }
+
+ @Override
+ public R pageActivityRegists(ComActActRegistVO comActActRegistVO) {
+ IPage<ComActActRegistVO> comActActRegistVOIPage = comActActRegistDAO.pageActivityRegists(new Page(comActActRegistVO.getPageNum(), comActActRegistVO.getPageSize()), comActActRegistVO);
+ return R.ok(comActActRegistVOIPage);
+ }
+
+ @Override
+ public R getEvaluateListsByIds(List<Long> ids) {
+ return R.ok(comActActEvaluateDAO.getEvaluateListsByIds(ids));
}
/**
@@ -489,6 +514,16 @@
page.setSize(pageSize);
page.setCurrent(pageNum);
IPage<ComActActivityVO> iPage = comActActivityDAO.pageActivityCommunityBack(page, comActActivityVO);
+ iPage.getRecords().forEach(vo ->{
+ List<ComActActEvaluateDO> comActActEvaluateDOList = comActActEvaluateDAO
+ .selectList(new QueryWrapper<ComActActEvaluateDO>().lambda().eq(ComActActEvaluateDO::getActivityId, vo.getId()));
+ if (comActActEvaluateDOList != null && comActActEvaluateDOList.size() != 0) {
+ //总星级
+ int starNum = comActActEvaluateDOList.stream().mapToInt(ComActActEvaluateDO::getStarLevel).sum();
+ //评分星级=总星级/总评价人数
+ vo.setEvaluateLevel(Double.valueOf(starNum/comActActEvaluateDOList.size()));
+ }
+ });
return R.ok(iPage);
}
--
Gitblit v1.7.1