文件上传

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

@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.yizhi.application.orm.id.IdGenerator;
 import com.yizhi.core.application.context.ContextHolder;
 import com.yizhi.core.application.context.RequestContext;
@@ -196,6 +197,15 @@ public class EventTrackServiceImpl extends ServiceImpl<EventTrackMapper, EventTr
             date = "3";
         }
         String dateString =getDateString(date);
+        String key = "event_track_type";
+        List<Dictionary> dictionaryList = dictionaryFeignClients.listChildDictionary(key,false,1);
+        Map<Integer,String> keyMap = Maps.newHashMap();
+        if(CollUtil.isNotEmpty(dictionaryList)){
+            dictionaryList.stream().forEach(d->{
+                keyMap.put(Integer.valueOf(d.getValue()),d.getCnName());
+            });
+
+        }
 
         List<EventTrackDeptNumVo> eventTrackDeptNumVoList = this.baseMapper.queryGropByList();
         if(CollUtil.isNotEmpty(eventTrackDeptNumVoList)){
@@ -217,7 +227,9 @@ public class EventTrackServiceImpl extends ServiceImpl<EventTrackMapper, EventTr
                            }
                        }else{
                            if(numVo.getType()==13){
-                               numVo.setSubType("评论总书");
+                               numVo.setSubType("评论总数");
+                           }else{
+                               numVo.setSubType(keyMap.get(numVo.getType()));
                            }
                            voList.add(numVo);
                        }
@@ -231,6 +243,11 @@ public class EventTrackServiceImpl extends ServiceImpl<EventTrackMapper, EventTr
                     EventTrackTypeNumVo vo = new EventTrackTypeNumVo();
                     vo.setType(t);
                     vo.setNum(0);
+                    if(vo.getType()==13){
+                        vo.setSubType("评论总数");
+                    }else{
+                        vo.setSubType(keyMap.get(vo.getType()));
+                    }
                     if(CollectionUtil.isNotEmpty(eventTrackDeptNumVo.getEventTrackTypeNumVoList())) {
                         Optional<EventTrackTypeNumVo> optional = eventTrackDeptNumVo.getEventTrackTypeNumVoList().stream().filter(v -> Objects.equals(v.getType(), t)).findFirst();
                         if(!(optional!=null&&optional.isPresent())){