소스 검색

学习时长排序

lamphua 1 개월 전
부모
커밋
8dc863a2f1

+ 11
- 0
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcStudyController.java 파일 보기

@@ -44,6 +44,17 @@ public class CmcStudyController extends BaseController
44 44
         return getDataTable(list);
45 45
     }
46 46
 
47
+    /**
48
+     * 查询学习记录列表
49
+     */
50
+    @GetMapping("/statistic")
51
+    public TableDataInfo getStudyStatistic(CmcStudy cmcStudy)
52
+    {
53
+        startPage();
54
+        List<CmcStudy> list = cmcStudyService.selectCmcStudyStatistic(cmcStudy);
55
+        return getDataTable(list);
56
+    }
57
+
47 58
     /**
48 59
      * 导出学习记录列表
49 60
      */

+ 10
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcStudy.java 파일 보기

@@ -39,6 +39,7 @@ public class CmcStudy extends BaseEntity
39 39
     /** 部门 */
40 40
     @Excel(name = "部门")
41 41
     private String deptName;
42
+    private Long deptId;
42 43
     private SysDept dept;
43 44
 
44 45
     /** 上次位置(视频文本百分比) */
@@ -81,6 +82,15 @@ public class CmcStudy extends BaseEntity
81 82
     {
82 83
         return userId;
83 84
     }
85
+    public void setDeptId(Long deptId)
86
+    {
87
+        this.deptId = deptId;
88
+    }
89
+
90
+    public Long getDeptId()
91
+    {
92
+        return deptId;
93
+    }
84 94
     public void setLastPoint(String lastPoint) 
85 95
     {
86 96
         this.lastPoint = lastPoint;

+ 8
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcStudyMapper.java 파일 보기

@@ -27,6 +27,14 @@ public interface CmcStudyMapper
27 27
      */
28 28
     public List<CmcStudy> selectCmcStudyList(CmcStudy cmcStudy);
29 29
 
30
+    /**
31
+     * 查询学习记录统计
32
+     *
33
+     * @param cmcStudy 学习记录
34
+     * @return 学习记录集合
35
+     */
36
+    public List<CmcStudy> selectCmcStudyStatistic(CmcStudy cmcStudy);
37
+
30 38
     /**
31 39
      * 新增学习记录
32 40
      * 

+ 8
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcStudyService.java 파일 보기

@@ -27,6 +27,14 @@ public interface ICmcStudyService
27 27
      */
28 28
     public List<CmcStudy> selectCmcStudyList(CmcStudy cmcStudy);
29 29
 
30
+    /**
31
+     * 查询学习记录统计
32
+     *
33
+     * @param cmcStudy 学习记录
34
+     * @return 学习记录集合
35
+     */
36
+    public List<CmcStudy> selectCmcStudyStatistic(CmcStudy cmcStudy);
37
+
30 38
     /**
31 39
      * 新增学习记录
32 40
      * 

+ 12
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcStudyServiceImpl.java 파일 보기

@@ -43,6 +43,18 @@ public class CmcStudyServiceImpl implements ICmcStudyService
43 43
         return cmcStudyMapper.selectCmcStudyList(cmcStudy);
44 44
     }
45 45
 
46
+    /**
47
+     * 查询学习记录统计
48
+     *
49
+     * @param cmcStudy 学习记录
50
+     * @return 学习记录
51
+     */
52
+    @Override
53
+    public List<CmcStudy> selectCmcStudyStatistic(CmcStudy cmcStudy)
54
+    {
55
+        return cmcStudyMapper.selectCmcStudyStatistic(cmcStudy);
56
+    }
57
+
46 58
     /**
47 59
      * 新增学习记录
48 60
      * 

+ 15
- 1
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcStudyMapper.xml 파일 보기

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
8 8
         <result property="studyId"    column="study_id"    />
9 9
         <result property="resourceId"    column="resource_id"    />
10 10
         <result property="userId"    column="user_id"    />
11
+        <result property="deptId"    column="dept_id"    />
11 12
         <result property="lastPoint"    column="last_point"    />
12 13
         <result property="lastTime"    column="last_time"    />
13 14
         <result property="getHours"    column="get_hours"    />
@@ -53,7 +54,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
53 54
             <if test="type != null "> and r.type like concat('%', #{type}, '%')</if>
54 55
         </where>
55 56
     </select>
56
-    
57
+
58
+    <select id="selectCmcStudyStatistic" parameterType="CmcStudy" resultMap="CmcStudyResult">
59
+        select * from
60
+        (select  s.user_id, d.dept_id, u.nick_name, d.dept_name, sum(s.get_hours) as get_hours from cmc_study as s
61
+        left join sys_user as u on u.user_id = s.user_id
62
+        left join sys_dept as d on d.dept_id = u.dept_id
63
+        left join cmc_resource as r on r.resource_id = s.resource_id
64
+        group by s.user_id ) as t
65
+        <where>
66
+            <if test="deptId != null "> and t.dept_id = #{deptId}</if>
67
+        </where>
68
+        order by t.get_hours desc
69
+    </select>
70
+
57 71
     <select id="selectCmcStudyByStudyId" parameterType="Integer" resultMap="CmcStudyResult">
58 72
         <include refid="selectCmcStudyVo"/>
59 73
         where study_id = #{studyId}

Loading…
취소
저장