工作台互动分析优化

cloud-site-service/src/main/java/com/yizhi/site/application/service/impl/EventTrackServiceImpl.java

@@ -595,28 +595,29 @@ public class EventTrackServiceImpl extends ServiceImpl<EventTrackMapper, EventTr
         if(CollUtil.isNotEmpty(eventTrackDeptNumVoList)){
             eventTrackDeptNumVoList.stream().forEach(eventTrackDeptNumVo -> {
                 List<EventTrackTypeNumVo> eventTrackTypeNumVoList = this.baseMapper.queryTgNumByDept(eventTrackDeptNumVo.getDeptName(),typeId,context.getSiteId());
-                if(CollectionUtil.isNotEmpty(eventTrackTypeNumVoList)){
-                    List<EventTrackTypeNumVo> voList = Lists.newArrayList();
-                    eventTrackTypeNumVoList.stream().forEach(numVo->{
-                        Optional<EventTrackTypeNumVo> optional= CollectionUtil.isEmpty(voList)?null:voList.stream().filter(v->Objects.equals(v.getType(),numVo.getType())).findFirst();
-                        if(optional!=null&&optional.isPresent()){
-                            EventTrackTypeNumVo vo = optional.get();
-                            if(numVo.getNum()!=null) {
-                                if(vo.getNum()!=null) {
-                                    vo.setNum(numVo.getNum()+vo.getNum());
-                                }else{
-                                    vo.setNum(numVo.getNum());
-                                }
-                            }
-                        }else{
-                            voList.add(numVo);
-                        }
-                    });
-                    eventTrackDeptNumVo.setEventTrackTypeNumVoList(voList);
-                }else {
-                    eventTrackDeptNumVo.setEventTrackTypeNumVoList(eventTrackTypeNumVoList);
-                }
-                eventTrackTypeNumVoList = Lists.newArrayList();
+//                if(CollectionUtil.isNotEmpty(eventTrackTypeNumVoList)){
+//                    List<EventTrackTypeNumVo> voList = Lists.newArrayList();
+//                    eventTrackTypeNumVoList.stream().forEach(numVo->{
+//                        Optional<EventTrackTypeNumVo> optional= CollectionUtil.isEmpty(voList)?null:voList.stream().filter(v->Objects.equals(v.getType(),numVo.getType())).findFirst();
+//                        if(optional!=null&&optional.isPresent()){
+//                            EventTrackTypeNumVo vo = optional.get();
+//                            if(numVo.getNum()!=null) {
+//                                if(vo.getNum()!=null) {
+//                                    vo.setNum(numVo.getNum()+vo.getNum());
+//                                }else{
+//                                    vo.setNum(numVo.getNum());
+//                                }
+//                            }
+//                        }else{
+//                            voList.add(numVo);
+//                        }
+//                    });
+//                    eventTrackDeptNumVo.setEventTrackTypeNumVoList(voList);
+//                }else {
+//                    eventTrackDeptNumVo.setEventTrackTypeNumVoList(eventTrackTypeNumVoList);
+//                }
+                eventTrackDeptNumVo.setEventTrackTypeNumVoList(eventTrackTypeNumVoList);
+                List<EventTrackTypeNumVo> newEventTrackTypeNumVoList = Lists.newArrayList();
                 for(Integer month:recentMonths){
                     EventTrackTypeNumVo eventTrackTypeNumVo = new EventTrackTypeNumVo();
                     if(CollectionUtil.isEmpty(eventTrackDeptNumVo.getEventTrackTypeNumVoList())){
@@ -632,9 +633,9 @@ public class EventTrackServiceImpl extends ServiceImpl<EventTrackMapper, EventTr
                             eventTrackTypeNumVo.setSubType(String.valueOf(month));
                         }
                     }
-                    eventTrackTypeNumVoList.add(eventTrackTypeNumVo);
+                    newEventTrackTypeNumVoList.add(eventTrackTypeNumVo);
                 }
-                eventTrackDeptNumVo.setEventTrackTypeNumVoList(eventTrackTypeNumVoList);
+                eventTrackDeptNumVo.setEventTrackTypeNumVoList(newEventTrackTypeNumVoList);
             });
         }