消息优化

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

@@ -162,8 +162,8 @@ public class EventTrackServiceImpl extends ServiceImpl<EventTrackMapper, EventTr
         if(Objects.equals(types.get(0),8)){
         if(Objects.equals(types.get(0),8)){
             String year = DateUtil.toShortYear(new Date());
             String year = DateUtil.toShortYear(new Date());
             DayNumVo dayNumVo = new DayNumVo();
             DayNumVo dayNumVo = new DayNumVo();
-            dayNumVo.setNum(this.baseMapper.getResearchTotal(year));
-            dayNumVo.setPreNum(this.baseMapper.getResearchJoinTotal(year));
+            dayNumVo.setPreNum(this.baseMapper.getResearchTotal(year));
+            dayNumVo.setNum(this.baseMapper.getResearchJoinTotal(year));
             return dayNumVo;
             return dayNumVo;
         }
         }
         return this.baseMapper.getNumByType(date,dateString,types);
         return this.baseMapper.getNumByType(date,dateString,types);

cloud-site-service/src/main/resources/mapper/EventTrackMapper.xml

@@ -184,7 +184,7 @@
     </select>
     </select>
     <select id="getResearchJoinTotal" resultType="java.lang.Integer">
     <select id="getResearchJoinTotal" resultType="java.lang.Integer">
         select
         select
-            count(1)
+            count(distinct research_id)
         from
         from
             cloud_research.tr_research_answer
             cloud_research.tr_research_answer
         where
         where