From 73bf57e3b13f145edb536dfa255a1ca51c55d97e Mon Sep 17 00:00:00 2001 From: daihh Date: Mon, 24 Oct 2022 14:04:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E4=BA=8Escore=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/school/study/api/StudyCourseApi.java | 7 +-- .../service/impl/StudyCourseServiceImpl.java | 58 ++++++++++++++----- 2 files changed, 47 insertions(+), 18 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java index 41559d7a..c57b9454 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java @@ -6,10 +6,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.xboe.common.utils.StringUtil; -import com.xboe.school.study.dto.StudyCourseNameDto; -import com.xboe.school.study.dto.StudyCourseQuery; -import com.xboe.school.study.dto.StudyCouseDto; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -22,11 +18,14 @@ import org.springframework.web.bind.annotation.RestController; import com.xboe.common.OrderCondition; import com.xboe.common.PageList; import com.xboe.common.Pagination; +import com.xboe.common.utils.StringUtil; import com.xboe.core.CurrentUser; import com.xboe.core.JsonResponse; import com.xboe.core.api.ApiBaseController; import com.xboe.module.course.service.ICourseService; import com.xboe.school.study.dto.StudyContentDto; +import com.xboe.school.study.dto.StudyCourseNameDto; +import com.xboe.school.study.dto.StudyCourseQuery; import com.xboe.school.study.entity.StudyCourse; import com.xboe.school.study.entity.StudyCourseItem; import com.xboe.school.study.entity.StudyTime; diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java index b379dc14..1f73479b 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java @@ -1,6 +1,20 @@ package com.xboe.school.study.service.impl; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import javax.transaction.Transactional; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + import com.xboe.common.OrderCondition; import com.xboe.common.PageList; import com.xboe.core.orm.FieldFilters; @@ -10,24 +24,21 @@ import com.xboe.core.orm.UpdateBuilder; import com.xboe.module.course.dao.CourseContentDao; import com.xboe.module.course.dao.CourseDao; import com.xboe.module.course.entity.Course; -import com.xboe.school.study.dao.*; +import com.xboe.school.study.dao.StudyAssessDao; +import com.xboe.school.study.dao.StudyCourseDao; +import com.xboe.school.study.dao.StudyCourseItemDao; +import com.xboe.school.study.dao.StudyExamDao; +import com.xboe.school.study.dao.StudyHomeWorkDao; +import com.xboe.school.study.dao.StudyScoreDao; +import com.xboe.school.study.dao.StudySignupDao; +import com.xboe.school.study.dao.StudyTimeDao; import com.xboe.school.study.dto.StudyCourseNameDto; import com.xboe.school.study.dto.StudyCourseQuery; -import com.xboe.school.study.dto.StudyCouseDto; import com.xboe.school.study.entity.StudyCourse; import com.xboe.school.study.entity.StudyCourseItem; import com.xboe.school.study.service.IStudyCourseService; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import javax.transaction.Transactional; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.List; +import lombok.extern.slf4j.Slf4j; @Slf4j @Service @@ -295,6 +306,7 @@ public class StudyCourseServiceImpl implements IStudyCourseService{ @Override public List followids(StudyCourseQuery studyCourseQuery) { + //当前先这样查询，以后要修改，只查询需要的字段，另外 ，需要按课程分组，不然一门课程会查出很多记录出来 QueryBuilder builder = QueryBuilder.from(StudyCourse.class.getSimpleName()+" sc,"+ Course.class.getSimpleName()+" c"); builder.addFilter(FieldFilters.eqField("sc.courseId","c.id")); // builder.addFilter(FieldFilters.eq("c.enabled",true)); @@ -303,8 +315,26 @@ public class StudyCourseServiceImpl implements IStudyCourseService{ builder.addFilter(FieldFilters.in("sc.courseId",studyCourseQuery.getIds())); builder.addOrder(OrderCondition.desc("sc.lastTime")); builder.addFields("sc"); - List list = studyCourseDao.findList(builder.builder()); - return list; + builder.addFields("c.score"); + //List list = studyCourseDao.findList(builder.builder()); + List rs=new ArrayList(); + Set checkSet=new HashSet(); + try { + List list= studyCourseDao.findListFields(builder.builder()); + for(Object[] objs:list) { + StudyCourse sc=(StudyCourse)objs[0]; + if(!checkSet.contains(sc.getCourseId())) { + Float score=(Float)objs[1]; + sc.setLastScore(score); + rs.add(sc); + checkSet.add(sc.getCourseId()); + } + } + return rs; + }catch(Exception e){ + + } + return rs; } @Override