mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-06 17:36:47 +08:00
Merge branch 'zcwy0823-llf' into master-0705
This commit is contained in:
@@ -57,7 +57,7 @@ public class StudyExamApi extends ApiBaseController{
|
|||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("/save")
|
@PostMapping("/save")
|
||||||
public JsonResponse<StudyExam> save(@RequestBody StudyExam exam,Integer contentTotal, HttpServletRequest request){
|
public JsonResponse<StudyExam> save(@RequestBody StudyExam exam, HttpServletRequest request){
|
||||||
if(StringUtils.isBlank(exam.getCourseId())) {
|
if(StringUtils.isBlank(exam.getCourseId())) {
|
||||||
return badRequest("无课程信息");
|
return badRequest("无课程信息");
|
||||||
}
|
}
|
||||||
@@ -100,7 +100,7 @@ public class StudyExamApi extends ApiBaseController{
|
|||||||
|
|
||||||
//执行完毕 清除redis记录
|
//执行完毕 清除redis记录
|
||||||
redisTemplate.delete(key);
|
redisTemplate.delete(key);
|
||||||
scDao.finishCheck(exam.getStudyId(),exam.getContentId(),contentTotal,token);
|
scDao.finishCheck(exam.getStudyId(),exam.getContentId(),exam.getContentTotal(),token);
|
||||||
List<StudyCourse> allUserList = thirdApi.getStudyCourseList(exam.getStudyId() ,exam.getCourseId(), token);
|
List<StudyCourse> allUserList = thirdApi.getStudyCourseList(exam.getStudyId() ,exam.getCourseId(), token);
|
||||||
log.info("在线课学习记录"+allUserList);
|
log.info("在线课学习记录"+allUserList);
|
||||||
return success(exam);
|
return success(exam);
|
||||||
|
|||||||
@@ -133,4 +133,7 @@ public class StudyExam extends IdEntity {
|
|||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Column(name = "last_time")
|
@Column(name = "last_time")
|
||||||
private LocalDateTime lastTime;
|
private LocalDateTime lastTime;
|
||||||
|
|
||||||
|
/**内容的总数量*/
|
||||||
|
private Integer contentTotal;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user