更新
This commit is contained in:
parent
79bdd61d35
commit
25ca575b27
@ -431,6 +431,7 @@ public class ProcessServiceImpl extends ServiceImpl<ProcessMapper, Process> impl
|
||||
.in(Process::getStatus, Arrays.asList("1", "2"))
|
||||
.in(Process::getSubject, Arrays.asList(1, 4))
|
||||
.isNotNull(Process::getExamScore)
|
||||
.orderByDesc(Process::getExamTime)
|
||||
);
|
||||
List<ExamVO> examBatchItemNew = examBatchItemMapper.selectExamByUserIdAndCoachId(userId, null);
|
||||
List<ExamVO> result = new ArrayList<>();
|
||||
|
@ -88,7 +88,7 @@ public class ReservationCourseServiceImpl extends ServiceImpl<ReservationCourseM
|
||||
//查该学员,该科目进度
|
||||
Process process = processService.getByStudentAndCourse(userId,courseId,subject,coachId,null);
|
||||
if(null==process){
|
||||
throw new Exception("该学员未报名你的课程,请向管理员核实");
|
||||
throw new RuntimeException("该学员未报名你的课程,请向管理员核实");
|
||||
}
|
||||
//查当天训练记录--未签退的
|
||||
rtnMap.put("train",trainService.getUserTrainData(userId,courseId,subject,nowDayStr));
|
||||
|
@ -116,10 +116,10 @@
|
||||
AND dss.`name` LIKE CONCAT('%',#{entity.name},'%')
|
||||
</if>
|
||||
<if test="entity.startTime!=null and entity.startTime!=''">
|
||||
AND dss.create_time >= #{startTime}
|
||||
AND dss.create_time >= #{entity.startTime}
|
||||
</if>
|
||||
<if test="entity.endTime!=null and entity.endTime!=''">
|
||||
AND dss.create_time <= #{endTime}
|
||||
AND dss.create_time <= #{entity.endTime}
|
||||
</if>
|
||||
AND dss.id IS NOT NULL
|
||||
ORDER BY
|
||||
|
Loading…
Reference in New Issue
Block a user