From 26780c533f2c2af6b9216306f649c1bcede94e4a Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期五, 24 十一月 2023 16:43:37 +0800
Subject: [PATCH] 学生、课程

---
 src/main/java/com/qxueyou/scc/admin/progress/service/impl/lecture/LectureDocProgressService.java |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/qxueyou/scc/admin/progress/service/impl/lecture/LectureDocProgressService.java b/src/main/java/com/qxueyou/scc/admin/progress/service/impl/lecture/LectureDocProgressService.java
index bc19ac7..6d775cd 100644
--- a/src/main/java/com/qxueyou/scc/admin/progress/service/impl/lecture/LectureDocProgressService.java
+++ b/src/main/java/com/qxueyou/scc/admin/progress/service/impl/lecture/LectureDocProgressService.java
@@ -1,6 +1,7 @@
 package com.qxueyou.scc.admin.progress.service.impl.lecture;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,14 +25,14 @@
 	}
 
 	/**
-	 * 获取进度百分比
+	 * 鑾峰彇杩涘害鐧惧垎姣�
 	 *
 	 * @param targetId
 	 * @param sum
 	 * @return
 	 */
 	@Override
-	public double getProgressPercent(String targetId, Double sum) {
+	public double getProgressPercent(String targetId, int sum) {
 
 		LectureDocV LectureDoc = lectureService.readDocLecture(targetId);
 
@@ -39,7 +40,7 @@
 	}
 
 	@Override
-	public Progress newProgress(String targetId, String learnerId, Double sum) {
+	public Progress newProgress(String targetId, String learnerId, int sum) {
 
 		Progress p = new Progress();
 		TraceUtils.setCreateTrace(p);
@@ -47,10 +48,17 @@
 		p.setLearnerId(learnerId);
 		p.setLearnerName(ClientUtils.getUserName());
 		p.setProgressUnit("s");
-		p.setProgressValue(BigDecimal.valueOf(Double.valueOf(sum)));
+		p.setProgressValue(BigDecimal.valueOf(Long.valueOf(sum)));
 		p.setTargetId(targetId);
 		p.setType(Progress.PROGRESS_TYPE_LECTURE);
 		p.setProgressPercent(getProgressPercent(targetId, sum));
+		p.setDeleteFlag(false);
+		p.setCreator(ClientUtils.getUserName());
+		p.setCreateId(ClientUtils.getUserId());
+		p.setCreateTime(new Date());
+		p.setUpdator(ClientUtils.getUserName());
+		p.setUpdateId(ClientUtils.getUserId());
+		p.setUpdateTime(new Date());
 
 		save(p);
 
@@ -58,10 +66,10 @@
 	}
 
 	@Override
-	public void updateProgress(String targetId, Progress p, Double sum) {
+	public void updateProgress(String targetId, Progress p, int sum) {
 
 		TraceUtils.setUpdateTrace(p);
-		p.setProgressValue(BigDecimal.valueOf(Double.valueOf(sum)));
+		p.setProgressValue(BigDecimal.valueOf(Long.valueOf(sum)));
 		if(p.getProgressPercent() == null || getProgressPercent(targetId, sum)>p.getProgressPercent()) {
 			p.setProgressPercent(getProgressPercent(targetId, sum));
 		}

--
Gitblit v1.8.0