培训课程排行改为根据课程学习记录创建时间查询

考试及格率排行改为根据考试开始时间查询

职工培训课程排行优化

exam-06173-api/src/main/java/com/gyee/exam/modules/course/mapper/CourseDepartMapper.java

@@ -19,7 +19,7 @@ import java.util.List;
 public interface CourseDepartMapper extends BaseMapper<CourseDepart> {
 
 
-    List<CourseUserRankDTO> courseUserRank(@Param("query") BaseQueryReqDTO reqDTO);
+    List<CourseUserRankDTO> courseUserRankNew(@Param("query") BaseQueryReqDTO reqDTO);
 
 
 }

exam-06173-api/src/main/java/com/gyee/exam/modules/course/service/impl/CourseDepartServiceImpl.java

@@ -68,7 +68,7 @@ public class CourseDepartServiceImpl extends ServiceImpl<CourseDepartMapper, Cou
     @Override
     public List<CourseUserRankDTO> courseUserRank(BaseQueryReqDTO reqDTO) {
 
-        List<CourseUserRankDTO> dtos = baseMapper.courseUserRank(reqDTO);
+        List<CourseUserRankDTO> dtos = baseMapper.courseUserRankNew(reqDTO);
 
         return dtos;
     }

exam-06173-api/src/main/resources/mapper/course/CourseDepartMapper.xml

@@ -31,11 +31,48 @@
             <if test="query!=null">
 
                 <if test="query.statDateL!=null ">
-                    AND ec.create_time >= #{query.statDateL}
+                    AND cl.create_time >= #{query.statDateL}
                 </if>
 
                 <if test="query.statDateR!=null ">
-                    AND ec.create_time &lt; #{query.statDateR}
+                    AND cl.create_time &lt; #{query.statDateR}
+                </if>
+
+                <if test="query.q!=null and query.q!=''">
+                    AND cd.dept_code = #{query.q}
+                </if>
+
+            </if>
+
+        </where>
+        group by uc.user_name,uc.real_name, uc.id
+        ORDER BY total DESC
+        LIMIT 20
+
+    </select>
+
+    <select id="courseUserRankNew" resultType="com.gyee.exam.modules.course.dto.response.CourseUserRankDTO">
+
+        SELECT
+        uc.user_name AS deptName,
+        uc.real_name AS realName,
+        SUM((SELECT IFNULL(SUM(learn_min),0) FROM el_course_file_learn fl WHERE fl.course_id=cl.course_id AND fl.user_id=cl.user_id )) AS total
+        FROM sys_user uc
+        LEFT JOIN el_course_learn cl ON cl.user_id=uc.id
+        INNER JOIN el_course ec on ec.id = cl.course_id
+        LEFT JOIN sys_depart sd on sd.dept_code = uc.dept_code
+
+        <where>
+
+            uc.id IS NOT NULL  AND  sd.data_flag != '1'
+            <if test="query!=null">
+
+                <if test="query.statDateL!=null ">
+                    AND cl.create_time >= #{query.statDateL}
+                </if>
+
+                <if test="query.statDateR!=null ">
+                    AND cl.create_time &lt; #{query.statDateR}
                 </if>
 
                 <if test="query.q!=null and query.q!=''">

exam-06173-api/src/main/resources/mapper/exam/ExamDepartMapper.xml

@@ -31,11 +31,11 @@
             <if test="query!=null">
 
                 <if test="query.statDateL!=null ">
-                    AND ep.create_time >= #{query.statDateL}
+                    AND ee.start_time >= #{query.statDateL}
                 </if>
 
                 <if test="query.statDateR!=null ">
-                    AND ep.limit_time &lt; #{query.statDateR}
+                    AND ee.start_time &lt; #{query.statDateR}
                 </if>
 
                 <if test="query.q!=null and query.q!=''">
@@ -66,11 +66,11 @@
             <if test="query!=null">
 
                 <if test="query.statDateL!=null ">
-                    AND ep.create_time >= #{query.statDateL}
+                    AND ee.start_time >= #{query.statDateL}
                 </if>
 
                 <if test="query.statDateR!=null ">
-                    AND ep.limit_time &lt; #{query.statDateR}
+                    AND ee.start_time &lt; #{query.statDateR}
                 </if>
 
                 <if test="query.q!=null and query.q!=''">