Merge remote-tracking branch 'origin/master'

fs-service-system/src/main/java/com/fs/course/param/FsCourseTrafficLogParam.java

@@ -27,4 +27,9 @@ public class FsCourseTrafficLogParam {
 
     private String startDate;
     private String endDate;
+
+    /**
+     * tab类型
+     */
+    private String tabType;
 }

fs-service-system/src/main/resources/mapper/course/FsCourseTrafficLogMapper.xml

@@ -74,7 +74,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and project = ${project}
             </if>
         </where>
-        group by company_id,`month`,project,course_id
+
+        <if test="tabType==null or tabType==''">
+            group by company_id,`month`,course_id,project
+        </if>
+        <if test="tabType!=null and tabType=='project'">
+            group by project,`month`
+        </if>
+        <if test="tabType!=null and tabType=='course'">
+            group by course_id,`month`
+        </if>
+        <if test="tabType!=null and tabType=='company'">
+            group by company_id,`month`
+        </if>
+
     </select>
     <select id="getTodayTrafficLog" resultType="java.lang.Long">
         SELECT