mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-10 11:26:50 +08:00
Merge remote-tracking branch 'origin/dev0525' into dev0525
This commit is contained in:
@@ -89,7 +89,6 @@ public class StudyHomeWorkApi extends ApiBaseController{
|
||||
return error("查询课程作业失败",e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping("/list-study")
|
||||
public JsonResponse<List<StudyHomeWork>> listByStudyIdContentId(String studyId,String contentId){
|
||||
if(StringUtils.isBlank(studyId)) {
|
||||
|
||||
@@ -98,8 +98,14 @@ public class StudyServiceImpl implements IStudyService{
|
||||
//sci.setProgress(100);//直接设置为学习完成
|
||||
sci.setLastTime(ldt);
|
||||
scItemDao.saveOrUpdate(sci);
|
||||
|
||||
|
||||
dto.setStudyItemId(sci.getId());
|
||||
if (sci.getId() != null){
|
||||
dto.setStudyItemId(sci.getId());
|
||||
}else {
|
||||
log.info("学习记录id不能为空"+sci.getId());
|
||||
throw new IllegalArgumentException("学习记录id不能为空");
|
||||
}
|
||||
//检查是否全部学习完成
|
||||
scDao.finishCheck(dto.getStudyId(),dto.getCourseId(),dto.getContentTotal(),token);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user