From d7963a84282c548fee3595b3343e6ae6ca49bb29 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期五, 24 十一月 2023 14:12:01 +0800
Subject: [PATCH] 学籍，考勤
---
src/main/java/com/qxueyou/scc/admin/progress/dao/ProgressDAO.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/admin/progress/dao/ProgressDAO.java b/src/main/java/com/qxueyou/scc/admin/progress/dao/ProgressDAO.java
index e51010d..1948350 100644
--- a/src/main/java/com/qxueyou/scc/admin/progress/dao/ProgressDAO.java
+++ b/src/main/java/com/qxueyou/scc/admin/progress/dao/ProgressDAO.java
@@ -29,24 +29,24 @@
}
/**
- * 根据targetId和learnerId获取进度
+ * 鏍规嵁targetId鍜宭earnerId鑾峰彇杩涘害
*
* @param targetId
* targetId
* @param learnerId
- * 学习者id
+ * 瀛︿範鑰卛d
* @return
*/
@Cacheable(value = "progress", key = "#targetId+#learnerId")
- public Double[][] getProgress(String targetId, String learnerId) {
+ public int[][] getProgress(String targetId, String learnerId) {
List<SubjectLectureProgressDetail> lstDetail = this.find("from SubjectLectureProgressDetail where targetId = ? and learnerId = ? and deleteFlag is false", CollectionUtils.newList(targetId, learnerId), SubjectLectureProgressDetail.class);
if(lstDetail == null || lstDetail.isEmpty()) {
- return new Double[][] {};
+ return new int[][] {};
}else {
- Double[][] progress = new Double[lstDetail.size()][2];
+ int[][] progress = new int[lstDetail.size()][2];
int i = 0;
for(SubjectLectureProgressDetail objDetail : lstDetail) {
- progress[i++] = new Double[] {objDetail.getStart(), objDetail.getEnd()};
+ progress[i++] = new int[] {objDetail.getStart(), objDetail.getEnd()};
}
return progress;
@@ -54,12 +54,12 @@
}
@CachePut(value = "progress", key = "#targetId+#learnerId")
- public Double[][] mergeProgress(String targetId, String learnerId, Double start, Double end, Double[][] origProgress) {
+ public int[][] mergeProgress(String targetId, String learnerId, int start, int end, int[][] origProgress) {
return StudyProgressUtils.merge(origProgress, start, end);
}
/**
- * 获取学生的各个节点的学习进度,进度值
+ * 鑾峰彇瀛︾敓鐨勫悇涓妭鐐圭殑瀛︿範杩涘害,杩涘害鍊�
*
* @param parentId
* @param userId
@@ -75,7 +75,7 @@
}
/**
- * 获取当前节点下的父节点
+ * 鑾峰彇褰撳墠鑺傜偣涓嬬殑鐖惰妭鐐�
*
* @param nodeId
* @return
@@ -88,7 +88,7 @@
}
/**
- * 根据subjectId获取章节列表
+ * 鏍规嵁subjectId鑾峰彇绔犺妭鍒楄〃
*
* @param parentId
* @param userId
@@ -101,7 +101,7 @@
}
/**
- * 获取progress 对象
+ * 鑾峰彇progress 瀵硅薄
*/
public Progress getProgressObject(String targetId, String userId) {
return findUniqueByHql(
@@ -110,7 +110,7 @@
}
/**
- * 记录用户每个课程学习的位置
+ * 璁板綍鐢ㄦ埛姣忎釜璇剧▼瀛︿範鐨勪綅缃�
*/
@CachePut(value = "lastStudied", key = "#userId + #subjectId + #classId")
public Map<String, Object> putStudyById(String userId, String subjectId, String lectureId, String lectureParentId,
@@ -137,7 +137,7 @@
}
/**
- * 获取用户每个课程上次学习的数据
+ * 鑾峰彇鐢ㄦ埛姣忎釜璇剧▼涓婃瀛︿範鐨勬暟鎹�
*/
@Cacheable(value = "lastStudied", key = "#userId + #subjectId +#classId")
public Map<String, Object> getStudyById(String userId, String subjectId, String classId) {
@@ -145,7 +145,7 @@
}
/**
- * 获取用户上次学习的数据
+ * 鑾峰彇鐢ㄦ埛涓婃瀛︿範鐨勬暟鎹�
*/
@Cacheable(value = "lastStudied", key = "#userId")
public Map<String, Object> getStudyByUserId(String userId) {
--
Gitblit v1.8.0