From 8cb82432832795a55d8a72c73484517d110a7b00 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 27 八月 2021 18:15:48 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into shequhuodong

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java |   70 +++++++++++++++++++++++++++++-----
 1 files changed, 59 insertions(+), 11 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 29f6e71..3432e39 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
@@ -1,15 +1,15 @@
 package com.panzhihua.service_community.service.impl;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.text.DecimalFormat;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 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.data.redis.core.StringRedisTemplate;
@@ -72,9 +72,9 @@
     @Resource
     private ComActActEvaluateDAO comActActEvaluateDAO;
     @Resource
-    private StringRedisTemplate stringRedisTemplate;
-    @Resource
     private ComActActRegistDAO comActActRegistDAO;
+    @Resource
+    private StringRedisTemplate stringRedisTemplate;
 
     /**
      * 新增社区活动
@@ -291,15 +291,50 @@
     }
 
     @Override
-    public R pageActivityRegists(ComActActEvaluateVO comActActEvaluateVO) {
+    public R getSignLists(ActivitySignVO activitySignVO) {
+        return R.ok(comActActSignDAO.getSignLists(activitySignVO));
+    }
+
+    @Override
+    public R pageActivityEvaluates(ComActActEvaluateVO comActActEvaluateVO) {
         IPage<ComActActEvaluateVO> comActActEvaluateVOIPage = comActActEvaluateDAO
-                .pageActivityRegists(new Page(comActActEvaluateVO.getPageNum(), comActActEvaluateVO.getPageSize()), comActActEvaluateVO);
+                .pageActivityEvaluates(new Page(comActActEvaluateVO.getPageNum(), comActActEvaluateVO.getPageSize()), comActActEvaluateVO);
         return R.ok(comActActEvaluateVOIPage);
     }
 
     @Override
-    public R getEvaluateListsByIds(List<Long> ids) {
-        return R.ok(comActActEvaluateDAO.getEvaluateListsByIds(ids));
+    public R getEvaluateLists(ComActActEvaluateVO comActActEvaluateVO) {
+        return R.ok(comActActEvaluateDAO.getEvaluateLists(comActActEvaluateVO));
+    }
+
+    @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 getRegistLists(ComActActRegistVO comActActRegistVO) {
+        return R.ok(comActActRegistDAO.getRegistLists(comActActRegistVO));
+    }
+
+    @Override
+    public R activityStatistics(Long activityId) {
+        ComActActivityStatisticsVO comActActivityStatisticsVO = comActActivityDAO.activityStatistics(activityId);
+        if (comActActivityStatisticsVO != null) {
+            if (comActActivityStatisticsVO.getSignTotal().equals(0)){
+                comActActivityStatisticsVO.setSignTotalStr("不限");
+                comActActivityStatisticsVO.setNoSignTotalStr("");
+                comActActivityStatisticsVO.setSignPersent("");
+            }else {
+                comActActivityStatisticsVO.setSignTotalStr(String.valueOf(comActActivityStatisticsVO.getSignTotal()));
+                comActActivityStatisticsVO.setNoSignTotalStr(String.valueOf(Integer.valueOf(comActActivityStatisticsVO.getSignTotalStr()) - comActActivityStatisticsVO.getReallySignTotal()));
+                comActActivityStatisticsVO.setSignPersent(getPersent(comActActivityStatisticsVO.getReallySignTotal(),comActActivityStatisticsVO.getSignTotal()));
+            }
+            comActActivityStatisticsVO.setRegistPersent(getPersent(comActActivityStatisticsVO.getReallyRegistTotal(),comActActivityStatisticsVO.getRegistTotal()));
+            comActActivityStatisticsVO.setEvaluatePersent(getPersent(comActActivityStatisticsVO.getReallyEvaluateTotal(),comActActivityStatisticsVO.getEvaluateTotal()));
+        }
+        return R.ok(comActActivityStatisticsVO);
     }
 
     /**
@@ -645,6 +680,19 @@
         return R.ok();
     }
 
+    private String getPersent(int x, int y){
+        if (y == 0) {
+            return "";
+        }
+        if (x == 0) {
+            return "0.00%";
+        }
+        double d1 = x * 1.0;
+        double d2 = y * 1.0;
+        DecimalFormat decimalFormat = new DecimalFormat("##.00%");
+        return decimalFormat.format(d1 / d2);
+    }
+
     /**
      * 用户签到
      *

--
Gitblit v1.7.1