tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

章节练习题目数量对不上的问题

Browse Source
beetlsql3-dev
Mlxa0324 2 years ago
parent c5839ff127
commit 4234ed15f3
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File

2
web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionSnapshotService.java
Unescape Escape View File

@ -351,7 +351,7 @@ public class ResourcesQuestionSnapshotService extends CoreBaseService<ResourcesQ
*/
public List<ResourcesQuestionSnapshot> getResourcesQuestionSnapshotList (
@NotEmpty(message = "开课题库列表不能为空！") final Collection<TeacherOpenCourseMergeResourcesQuestion> questionList,
@NotBlank(message = "题目配置ID不能为空！") Long teacherOpenCourseQuestionSettingId, Consumer<ResourcesQuestionSnapshot> otherConsumer) {
@NotNull(message = "题目配置ID不能为空！") Long teacherOpenCourseQuestionSettingId, Consumer<ResourcesQuestionSnapshot> otherConsumer) {
// 批量插入快照表
List<ResourcesQuestionSnapshot> snapshotList = BeanUtil.copyToList(questionList, ResourcesQuestionSnapshot.class);
Consumer<ResourcesQuestionSnapshot> resourcesQuestionSnapshotConsumer = snapshot -> {

31
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java
Unescape Escape View File

@ -15,16 +15,15 @@ import com.ibeetl.admin.core.util.PlatformException;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.admin.core.web.JsonReturnCode;
import com.ibeetl.jlw.dao.ResourcesQuestionDao;
import com.ibeetl.jlw.dao.TeacherOpenCourseMergeCourseInfoDao;
import com.ibeetl.jlw.dao.TeacherOpenCourseMergeResourcesQuestionDao;
import com.ibeetl.jlw.entity.CourseInfo;
import com.ibeetl.jlw.entity.FileEntity;
import com.ibeetl.jlw.entity.ResourcesQuestion;
import com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesQuestion;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.entity.dto.QuestionSettingDTO;
import com.ibeetl.jlw.entity.vo.QuestionTypeCountVO;
import com.ibeetl.jlw.enums.ResourcesQuestionTypeEnum;
import com.ibeetl.jlw.web.query.ResourcesQuestionQuery;
import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeResourcesQuestionQuery;
import com.ibeetl.jlw.web.query.TeacherOpenCourseQuestionSettingQuery;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@ -35,8 +34,10 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.beetl.sql.core.SqlId;
import org.beetl.sql.core.engine.PageQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import javax.validation.constraints.Max;
@ -66,7 +67,12 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ
@Autowired private TeacherOpenCourseMergeResourcesQuestionDao teacherOpenCourseMergeResourcesQuestionDao;
@Autowired private ResourcesQuestionDao resourcesQuestionDao;
@Autowired private TeacherOpenCourseMergeCourseInfoDao teacherOpenCourseMergeCourseInfoDao;
@Autowired @Lazy
private TeacherOpenCourseQuestionSettingService teacherOpenCourseQuestionSettingService;
@Autowired private ResourcesQuestionService resourcesQuestionService;
@Autowired
private ResourcesQuestionSnapshotService resourcesQuestionSnapshotService;
public PageQuery<TeacherOpenCourseMergeResourcesQuestion>queryByCondition(PageQuery query){
PageQuery ret = teacherOpenCourseMergeResourcesQuestionDao.queryByCondition(query);
@ -112,7 +118,7 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ
query.set_given("questionStatus");
teacherOpenCourseMergeResourcesQuestionDao.updateGivenByIds(query);
} catch (Exception e) {
throw new PlatformException("批量删除开课题目拉取失败", e);
throw new PlatformException("批量上下架开课题目失败", e);
}
}
@ -139,6 +145,7 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ
}
public JsonResult add(TeacherOpenCourseMergeResourcesQuestionQuery teacherOpenCourseMergeResourcesQuestionQuery){
String msg = "";
TeacherOpenCourseMergeResourcesQuestion teacherOpenCourseMergeResourcesQuestion = teacherOpenCourseMergeResourcesQuestionQuery.pojo();
teacherOpenCourseMergeResourcesQuestionDao.insert(teacherOpenCourseMergeResourcesQuestion);
@ -147,6 +154,20 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ
jsonResult.setData(teacherOpenCourseMergeResourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId());//自增的ID丢进去
jsonResult.setCode(JsonReturnCode.SUCCESS.getCode());
jsonResult.setMsg(msg);
// 添加题目的时候，如果选择的是章节的话，则往题目快照中也添加一份这里，直接根据课程ID查询是否是章节，以防万一
List<TeacherOpenCourseMergeCourseInfo> mergeCourseInfoList = teacherOpenCourseMergeCourseInfoDao.getByIds(teacherOpenCourseMergeResourcesQuestion.getTeacherOpenCourseMergeCourseInfoId().toString());
TeacherOpenCourseMergeCourseInfo courseInfo = CollectionUtils.firstElement(mergeCourseInfoList);
if(null != courseInfo && courseInfo.getCourseInfoType() == 2) {
String courseInfoName = courseInfo.getCourseInfoName();
TeacherOpenCourseQuestionSettingQuery questionSettingQuery = new TeacherOpenCourseQuestionSettingQuery();
questionSettingQuery.setTeacherOpenCourseQuestionSettingName(courseInfoName);
questionSettingQuery.setTeacherOpenCourseQuestionSettingStatus(1);
TeacherOpenCourseQuestionSetting questionSetting = teacherOpenCourseQuestionSettingService.getInfo(questionSettingQuery);
Long questionSettingId = questionSetting.getTeacherOpenCourseQuestionSettingId();
List<ResourcesQuestionSnapshot> snapshotList = resourcesQuestionSnapshotService.getResourcesQuestionSnapshotList(Collections.singletonList(teacherOpenCourseMergeResourcesQuestion), questionSettingId, (o) -> {});
resourcesQuestionSnapshotService.insertBatch(snapshotList);
}
return jsonResult;
}

Write Preview
Loading…
Cancel
Save