评价计划调整

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateObjectServiceImpl.java

@@ -42,7 +42,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
@@ -70,12 +69,13 @@ public class EvaluateObjectServiceImpl extends MPJBaseServiceImpl<EvaluateObject
         List<EvaluateObjectListVo> objectList = evaluateObjectMapper.getObjectList(dto);
         List<EvaluateExecuterVo> allExecuterList = evaluateObjectMapper.getExecuterList(dto);
 
-        Map<String, List<EvaluateExecuterVo>> groupEvaluateExecuterByEvaluateObjectId = allExecuterList.stream()
-                .collect(Collectors.groupingBy(EvaluateExecuterVo::getEvaluateObjectId));
+//        Map<String, List<EvaluateExecuterVo>> groupEvaluateExecuterByEvaluateObjectId = allExecuterList.stream()
+//                .collect(Collectors.groupingBy(EvaluateExecuterVo::getEvaluateObjectId));
         for (EvaluateObjectListVo objectVo : objectList) {
-            objectVo.setExecuterCount(groupEvaluateExecuterByEvaluateObjectId.get(objectVo.getId()).size());
-            objectVo.setExecuterList(groupEvaluateExecuterByEvaluateObjectId.get(objectVo.getId()));
-            /*List<EvaluateExecuterVo> executerList = new ArrayList<>();
+//            List<EvaluateExecuterVo> executerVoList = groupEvaluateExecuterByEvaluateObjectId.get(objectVo.getId());
+//            objectVo.setExecuterCount(executerVoList.size());
+//            objectVo.setExecuterList(executerVoList);
+            List<EvaluateExecuterVo> executerList = new ArrayList<>();
             for (EvaluateExecuterVo executerVo : allExecuterList) {
                 if(objectVo.getId().equals(executerVo.getEvaluateObjectId())){
                     executerList.add(executerVo);
@@ -83,7 +83,7 @@ public class EvaluateObjectServiceImpl extends MPJBaseServiceImpl<EvaluateObject
             }
 
             objectVo.setExecuterCount(executerList.size());
-            objectVo.setExecuterList(executerList);*/
+            objectVo.setExecuterList(executerList);
         }
         return objectList;
     }