Ver código fonte

活动管理页面 统计修改

ZHIHAO HU 4 anos atrás
pai
commit
363f4355e7

+ 3 - 0
src/main/java/platform/modules/government/web/ActivityController.java

@@ -59,6 +59,7 @@ import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadPoolExecutor;
+import java.util.stream.Stream;
 
 
 @Controller
@@ -183,6 +184,8 @@ public class ActivityController extends BaseController {
         Map<String, Integer> scoreCount = activityFeedbackService.getScoreCount(id + "", null, null, null, null);
         modelMap.put("fileUrl", setFileUrl());
         modelMap.addAttribute("registrationList", registrationList);
+        Stream<ActivityRegistration> registrationSuccessList =registrationList.stream().filter(reg-> (reg.getReview_state().equals("0")||reg.getReview_state().equals("1")));
+        modelMap.addAttribute("registrationSuccessList", registrationSuccessList);
         modelMap.addAttribute("signList", signList);
 //        modelMap.addAttribute("feedbackList", feedbackList);
         modelMap.addAttribute("activity_id", id);

+ 1 - 0
src/main/resources/mapper/sys/ActivityDetailDao.xml

@@ -50,6 +50,7 @@
         WHERE
         del_flag = 0
         and activity_id = detail.id
+        and review_state in ('0','1')
         ) registration_number,
         (
         SELECT

+ 1 - 1
src/main/resources/templates/admin/government/activity_detail.html

@@ -235,7 +235,7 @@
         <!--报名信息-->
         <div class="tabCon">
             <span class="l" th:if="${quota != null && quota != ''}" th:text="${'审核通过/名额人数:'+num+'/'+quota}"></span>
-            <span class="r" th:text="${'共报名'+#lists.size(registrationList)+'人'}"></span>
+            <span class="r" th:text="${'共报名'+#lists.size(registrationSuccessList)+'人'}"></span>
             <table class="table table-border table-bordered table-bg table-hover"
                    style="table-layout: fixed;width:100%;">
                 <thead>