From 1cece5a2242fed0a3948eb845d488126dde93903 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 09 七月 2024 14:05:26 +0800
Subject: [PATCH] 首页时长单位
---
src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java | 4 ++++
src/main/java/com/ycl/jxkg/service/impl/HomeServiceImpl.java | 6 ++++--
src/main/java/com/ycl/jxkg/domain/vo/student/HomeVO.java | 3 ++-
src/main/resources/application.yml | 2 +-
src/main/resources/mapper/UserMapper.xml | 1 +
5 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/student/HomeVO.java b/src/main/java/com/ycl/jxkg/domain/vo/student/HomeVO.java
index 2f8c523..81cd52a 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/student/HomeVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/student/HomeVO.java
@@ -7,6 +7,7 @@
import com.ycl.jxkg.domain.vo.MeetVO;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -14,7 +15,7 @@
public class HomeVO {
private Integer userId;
//鐪嬭棰戞椂闀�
- private Long studyTime;
+ private BigDecimal studyTime;
//鏈�鍚庣湅瑙嗛鏃堕棿
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
index 87992df..98b9c3a 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -249,6 +249,10 @@
.eq(ExamSubmitTemp::getUserId, webContext.getCurrentUser().getId())
.one();
if (Objects.nonNull(hasJoin)) {
+ //TODO锛氬紑鍙戠幆澧冨厛鍏抽棴
+// if(ExamSubmitTempStatusEnum.finish.equals(hasJoin.getStatus())){
+// throw new RuntimeException("鎮ㄥ凡鎻愪氦璇曞嵎锛岃鍕块噸澶嶄綔绛�");
+// }
StartExamVO startExamVO = new StartExamVO();
startExamVO.setExamName(exam.getExamName());
startExamVO.setId(hasJoin.getExamId());
diff --git a/src/main/java/com/ycl/jxkg/service/impl/HomeServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/HomeServiceImpl.java
index b61702f..ffa07ac 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/HomeServiceImpl.java
@@ -61,11 +61,13 @@
//瀛︿範璁板綍
StudyRecord studyRecord = studyRecordMapper.getByStudentId(userId);
if (studyRecord != null) {
+ Long studyTime = studyRecord.getStudyTime();
+ BigDecimal studyTimeVo = new BigDecimal(studyTime).divide(new BigDecimal(3600), 1, RoundingMode.HALF_UP);
vo.setLastTime(studyRecord.getLastTime());
- vo.setStudyTime(studyRecord.getStudyTime());
+ vo.setStudyTime(studyTimeVo);
vo.setMeetCount(studyRecord.getMeetCount());
}else {
- vo.setStudyTime(0L);
+ vo.setStudyTime(BigDecimal.ZERO);
vo.setMeetCount(0);
}
//骞冲潎鍒�
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ac1a3c4..0463e0e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -80,4 +80,4 @@
#runningtime environment
profiles:
- active: prod
+ active: dev
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index b3fa2cd..4015a23 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -201,6 +201,7 @@
FROM t_user tu
INNER JOIN t_classes_user tcu ON tu.id = tcu.user_id
WHERE tcu.classes_id = #{classesId}
+ and tcu.deleted = 0
ORDER BY tcu.create_time
</select>
--
Gitblit v1.8.0