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