dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
许允枞 2025-04-09 17:39:20 +08:00
parent 79bdd61d35
commit 25ca575b27
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/impl/ProcessServiceImpl.java
View File

@ -431,6 +431,7 @@ public class ProcessServiceImpl extends ServiceImpl<ProcessMapper, Process> impl
.in(Process::getStatus, Arrays.asList("1", "2")) .in(Process::getStatus, Arrays.asList("1", "2"))
.in(Process::getSubject, Arrays.asList(1, 4)) .in(Process::getSubject, Arrays.asList(1, 4))
.isNotNull(Process::getExamScore) .isNotNull(Process::getExamScore)
.orderByDesc(Process::getExamTime)
); );
List<ExamVO> examBatchItemNew = examBatchItemMapper.selectExamByUserIdAndCoachId(userId, null); List<ExamVO> examBatchItemNew = examBatchItemMapper.selectExamByUserIdAndCoachId(userId, null);
List<ExamVO> result = new ArrayList<>(); List<ExamVO> result = new ArrayList<>();

2
dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/service/impl/ReservationCourseServiceImpl.java
View File

@ -88,7 +88,7 @@ public class ReservationCourseServiceImpl extends ServiceImpl<ReservationCourseM
//查该学员，该科目进度 //查该学员，该科目进度
Process process = processService.getByStudentAndCourse(userId,courseId,subject,coachId,null); Process process = processService.getByStudentAndCourse(userId,courseId,subject,coachId,null);
if(null==process){ if(null==process){
throw new Exception("该学员未报名你的课程，请向管理员核实"); throw new RuntimeException("该学员未报名你的课程，请向管理员核实");
} }
//查当天训练记录--未签退的 //查当天训练记录--未签退的
rtnMap.put("train",trainService.getUserTrainData(userId,courseId,subject,nowDayStr)); rtnMap.put("train",trainService.getUserTrainData(userId,courseId,subject,nowDayStr));

4
dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolStudentMapper.xml
View File

@ -116,10 +116,10 @@
AND dss.`name` LIKE CONCAT('%',#{entity.name},'%') AND dss.`name` LIKE CONCAT('%',#{entity.name},'%')
</if> </if>
<if test="entity.startTime!=null and entity.startTime!=''"> <if test="entity.startTime!=null and entity.startTime!=''">
AND dss.create_time &gt;= #{startTime} AND dss.create_time &gt;= #{entity.startTime}
</if> </if>
<if test="entity.endTime!=null and entity.endTime!=''"> <if test="entity.endTime!=null and entity.endTime!=''">
AND dss.create_time &lt;= #{endTime} AND dss.create_time &lt;= #{entity.endTime}
</if> </if>
AND dss.id IS NOT NULL AND dss.id IS NOT NULL
ORDER BY ORDER BY