活动投票状态筛选优化

cloud-training-project-service/src/main/java/com/yizhi/training/application/service/impl/TpContentStudentStatusServiceUsing.java

@@ -136,8 +136,25 @@ public class TpContentStudentStatusServiceUsing {
         boolean inPlanEndTime;
         boolean inPlanEndTime;
 
 
         // 计划 id ：计划 vo map
         // 计划 id ：计划 vo map
+        RequestContext context= ContextHolder.get();
         Map<Long, TrainingProjectContentPlanVo> map = new TreeMap<>();
         Map<Long, TrainingProjectContentPlanVo> map = new TreeMap<>();
         for (TpPlan plan : plans) {
         for (TpPlan plan : plans) {
+
+            TpPlanActivity activityExample = new TpPlanActivity();
+            activityExample.setTrainingProjectId(project.getId());
+            activityExample.setTpPlanId(plan.getId());
+            TpPlanActivity planActivity = tpPlanActivityMapper.selectOne(activityExample);
+            if(planActivity != null) {
+                CheckResearchStateVo checkResearchStateVo = new CheckResearchStateVo();
+                checkResearchStateVo.setContext(context);
+                checkResearchStateVo.setResearchId(planActivity.getRelationId());
+                Integer count = researchClient.checkTPlanResearchState(checkResearchStateVo);
+                log.info("查询活动id:{}中,投票id:{}中的投票状态count:{}", planActivity.getTrainingProjectId(), planActivity.getRelationId(), count);
+                if(count.intValue() <= 0) {
+                    continue;
+                }
+            }
+
             conditionPost.setTpPlanId(plan.getId());
             conditionPost.setTpPlanId(plan.getId());
             conditionPre.setPlanId(plan.getId());
             conditionPre.setPlanId(plan.getId());
 
 
@@ -191,18 +208,7 @@ public class TpContentStudentStatusServiceUsing {
         List<TpPlanActivity> allActivities = tpPlanActivityMapper.selectList(activityEW);
         List<TpPlanActivity> allActivities = tpPlanActivityMapper.selectList(activityEW);
 
 
         if (!CollectionUtils.isEmpty(allActivities)) {
         if (!CollectionUtils.isEmpty(allActivities)) {
-
-            RequestContext context= ContextHolder.get();
-
             for (TpPlanActivity activity : allActivities) {
             for (TpPlanActivity activity : allActivities) {
-                CheckResearchStateVo checkResearchStateVo = new CheckResearchStateVo();
-                checkResearchStateVo.setContext(context);
-                checkResearchStateVo.setResearchId(activity.getRelationId());
-                Integer count = researchClient.checkTPlanResearchState(checkResearchStateVo);
-                log.info("查询活动id:{}中,投票id:{}中的投票状态count:{}", activity.getTrainingProjectId(), activity.getRelationId(), count);
-                if(count.intValue() <= 0) {
-                    continue;
-                }
                 TrainingProjectContentActivityVo activityVo = new TrainingProjectContentActivityVo();
                 TrainingProjectContentActivityVo activityVo = new TrainingProjectContentActivityVo();
                 activityVo.setType(activity.getType());
                 activityVo.setType(activity.getType());
                 activityVo.setRelationId(activity.getRelationId());
                 activityVo.setRelationId(activity.getRelationId());