看课流量项目关联修改

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

@@ -269,43 +269,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <select id="selectTrafficNew" resultType="com.fs.course.vo.FsCourseTrafficLogListVO">
-        select company_id,project,course_id,SUM(internet_traffic) AS total_internet_traffic
-        ,DATE_FORMAT(create_time, '%Y-%m-%d') AS `month` from fs_course_traffic_log
+        select log.company_id,
+        uc.project,
+        log.course_id,
+        SUM( log.internet_traffic ) AS total_internet_traffic,
+        DATE_FORMAT( log.create_time, '%Y-%m-%d' ) AS `month`
+        FROM
+        fs_course_traffic_log log
+        LEFT JOIN fs_user_course uc on log.course_id=uc.course_id
         <where>
             <if test="startDate != null and endDate != null">
-                and DATE_FORMAT(create_time, '%Y-%m-%d') between #{startDate} AND #{endDate}
+                and DATE_FORMAT(log.create_time, '%Y-%m-%d') between #{startDate} AND #{endDate}
             </if>
             <if test='companyId !=null'>
-                and company_id = #{companyId}
+                and log.company_id = #{companyId}
             </if>
             <if test="courseId != null">
-                and course_id = ${courseId}
+                and log.course_id = ${courseId}
             </if>
             <if test="project != null">
-                and project = ${project}
+                and uc.project = ${project}
             </if>
             <if test="common == null">
-                AND company_id IS not NULL
+                AND log.company_id IS not NULL
             </if>
             <if test="common != null ">
-                AND company_id IS NULL
+                AND log.company_id IS NULL
             </if>
             <if test="companyUserId != null">
-                and company_user_id = #{companyUserId}
+                and log.company_user_id = #{companyUserId}
             </if>
         </where>
 
         <if test="tabType==null or tabType==''">
-            group by company_id,`month`,course_id,project
+            group by log.company_id,`month`,log.course_id,uc.project
         </if>
         <if test="tabType!=null and tabType=='project'">
-            group by company_id,project,`month`
+            group by log.company_id,uc.project,`month`
         </if>
         <if test="tabType!=null and tabType=='course'">
-            group by company_id,course_id,`month`
+            group by log.company_id,log.course_id,`month`
         </if>
         <if test="tabType!=null and tabType=='common'">
-            group by course_id,`month`
+            group by log.company_id,log.course_id,`month`
         </if>
     </select>