工作台修改

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

@@ -417,8 +417,9 @@ public class EventTrackServiceImpl extends ServiceImpl<EventTrackMapper, EventTr
             }
         }
         List<String> subNameList = null;
+        List<DataClassification>  classificationList =  null;
         if(id!=null) {
-            List<DataClassification>  classificationList =  dataClassificationService.getSon(id);
+            classificationList =  dataClassificationService.getSon(id);
             if(CollectionUtil.isNotEmpty(classificationList)){
                 subNameList = classificationList.stream().map(DataClassification::getName).collect(Collectors.toList());
             }
@@ -427,7 +428,11 @@ public class EventTrackServiceImpl extends ServiceImpl<EventTrackMapper, EventTr
         //判断是否获取阅读量
         if(types.get(0).equals(6)){
             //阅读量
-            eventTrackTypeNumVoList = this.baseMapper.queryNumByTypeInformation(null,date,dateString,types,subNameList,context.getSiteId(), isPre);
+            List<String> subIdList = Lists.newArrayList();
+            for(DataClassification item : classificationList){
+                subIdList.add(item.getId().toString());
+            }
+            eventTrackTypeNumVoList = this.baseMapper.queryNumByTypeInformation(null,date,dateString,types,subIdList,context.getSiteId(), isPre);
         } else {
             eventTrackTypeNumVoList = this.baseMapper.queryNumByType(null,date,dateString,types,subNameList,context.getSiteId(), isPre);
         }
@@ -680,7 +685,7 @@ public class EventTrackServiceImpl extends ServiceImpl<EventTrackMapper, EventTr
 
     @Override
     public List<EventTrackDeptNumVo> queryExamNum() {
-        //统计参加活动
+        //统计参加测试
         RequestContext context = ContextHolder.get();
         List<EventTrackDeptNumVo> eventTrackDeptNumVoList = this.baseMapper.queryGropByList(context.getSiteId());
         if (CollUtil.isNotEmpty(eventTrackDeptNumVoList)) {

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

@@ -314,8 +314,10 @@
 
     <select id="queryNumByTypeInformation" resultType="com.yizhi.site.application.vo.site.EventTrackTypeNumVo">
         select
-        e.type,e.remark1 as subType,count(t.id) as num
+        e.type,dclass.name as subType,count(t.id) as num
         from event_track e
+        LEFT JOIN information inf ON e.business_id=inf.id
+        LEFT JOIN data_classification dclass ON dclass.id=inf.type_two
         LEFT JOIN event_track t ON e.id=t.id
         <if test="date==4">
             and WEEK(e.create_time) = WEEK(now()) and DATE_FORMAT(e.create_time, '%Y')   = DATE_FORMAT(now(), '%Y')
@@ -347,7 +349,7 @@
             </foreach>
         </if>
         <if test="subNameList!=null and subNameList.size()>0">
-            AND e.remark1 IN
+            AND inf.type_two IN
             <foreach collection="subNameList" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
@@ -355,8 +357,7 @@
         <if test="deptId!=null">
             and e.dept_id = #{deptId}
         </if>
-        AND e.remark1 IS NOT NULL
-        group by e.type,e.remark1
+        group by e.type,dclass.name
         order by e.type
     </select>
 
@@ -372,7 +373,7 @@
         SELECT agm.group_id AS subType,count(DISTINCT e.create_by_id) AS num
         FROM cloud_exam.exam e
         INNER JOIN cloud_system.authz_group_member agm ON agm.member_id=e.org_id AND agm.deleted = 0
-        WHERE e.state=2 AND
+        WHERE e.state=2
         GROUP BY agm.group_id
     </select>
 </mapper>
\ No newline at end of file