From 8d0e57a64fe6c31559ffcf38859fb1f5084e1e23 Mon Sep 17 00:00:00 2001
From: Administrator <2863138610@qq.com>
Date: 星期一, 21 十一月 2022 11:09:20 +0800
Subject: [PATCH] 课程管理学习端修改And用户信息缓存修改

---
 src/main/java/com/qxueyou/scc/admin/progress/service/impl/lecture/LectureCommonProgressService.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/qxueyou/scc/admin/progress/service/impl/lecture/LectureCommonProgressService.java b/src/main/java/com/qxueyou/scc/admin/progress/service/impl/lecture/LectureCommonProgressService.java
index eb463b0..6257600 100644
--- a/src/main/java/com/qxueyou/scc/admin/progress/service/impl/lecture/LectureCommonProgressService.java
+++ b/src/main/java/com/qxueyou/scc/admin/progress/service/impl/lecture/LectureCommonProgressService.java
@@ -29,19 +29,19 @@
 	ProgressDAO dao;
 
 	@Override
-	public Result addProgress(String targetId, String learnerId, int start, int end) {
+	public Result addProgress(String targetId, String learnerId, Double start, Double end) {
 
 		if (start > end || start < 0 || end < 0) {
 			return new Result(false, "invalid arguments");
 		}
 
-		int[][] progress = dao.mergeProgress(targetId, learnerId, start, end , dao.getProgress(targetId, learnerId));
+		Double[][] progress = dao.mergeProgress(targetId, learnerId, start, end , dao.getProgress(targetId, learnerId));
 
 		if (!checkLecture(targetId).isSuccess()) {
 			return checkLecture(targetId);
 		}
 
-		int sum = StudyProgressUtils.sum(progress);
+		Double sum = StudyProgressUtils.sum(progress);
 
 		Progress p = dao.getProgress(Progress.PROGRESS_TYPE_LECTURE, targetId, learnerId);
 
@@ -50,7 +50,7 @@
 		} else {
 			updateProgress(targetId, p, sum);
 		}
-		
+
 		//保存学习记录明细
 		this.saveProgressDetail(start, end, targetId, p.getProgressId(), learnerId);
 
@@ -67,17 +67,17 @@
 	protected Result checkLecture(String targetId) {
 		return new Result(true);
 	}
-	
+
 	/**
 	 * 保存学习记录明细
-	 * 
+	 *
 	 * @param start
 	 * @param end
 	 * @param targetId
 	 * @param progressId
 	 * @param learnerId
 	 */
-	private void saveProgressDetail(int start, int end, String targetId, String progressId, String learnerId) {
+	private void saveProgressDetail(Double start, Double end, String targetId, String progressId, String learnerId) {
 		SubjectLectureProgressDetail detail = new SubjectLectureProgressDetail();
 		detail.setDeleteFlag(false);
 		detail.setEnd(end);
@@ -85,20 +85,20 @@
 		detail.setTargetId(targetId);
 		detail.setProgressId(progressId);
 		detail.setLearnerId(learnerId);
-		
+
 		TraceUtils.setCreateTrace(detail);
-		
+
 		this.save(detail);
 	}
 
 	/**
 	 * 获取进度百分比
-	 * 
+	 *
 	 * @param targetId
 	 * @param sum
 	 * @return
 	 */
-	protected double getProgressPercent(String targetId, int sum) {
+	protected double getProgressPercent(String targetId, Double sum) {
 		return 1.00d;
 	}
 
@@ -107,17 +107,17 @@
 		return Progress.PROGRESS_TYPE_LECTURE;
 	}
 
-	protected void updateProgress(String targetId, Progress p, int sum) {
+	protected void updateProgress(String targetId, Progress p, Double sum) {
 
 		TraceUtils.setUpdateTrace(p);
-		p.setProgressValue(BigDecimal.valueOf(Long.valueOf(sum)));
+		p.setProgressValue(BigDecimal.valueOf(Double.valueOf(sum)));
 		p.setProgressPercent(1d);
 
 		save(p);
 
 	}
 
-	protected Progress newProgress(String targetId, String learnerId, int sum) {
+	protected Progress newProgress(String targetId, String learnerId, Double sum) {
 
 		Progress p = new Progress();
 		TraceUtils.setCreateTrace(p);
@@ -125,12 +125,12 @@
 		p.setLearnerId(learnerId);
 		p.setLearnerName(ClientUtils.getUserName());
 		p.setProgressUnit("s");
-		p.setProgressValue(BigDecimal.valueOf(Long.valueOf(sum)));
+		p.setProgressValue(BigDecimal.valueOf(Double.valueOf(sum)));
 		p.setTargetId(targetId);
 		p.setType(Progress.PROGRESS_TYPE_LECTURE);
 		p.setProgressPercent(1d);
 		save(p);
-		
+
 		return p;
 	}
 

--
Gitblit v1.8.0