diff --git a/doc/sql/mysql/tianze-pro-update.sql b/doc/sql/mysql/tianze-pro-update.sql index b2c42c30..9e390b4d 100644 --- a/doc/sql/mysql/tianze-pro-update.sql +++ b/doc/sql/mysql/tianze-pro-update.sql @@ -362,4 +362,6 @@ ALTER TABLE teacher_open_course_merge_schedule_session ADD COLUMN teacher_open_c -- 回显用 ALTER TABLE resources_question_snapshot ADD COLUMN teacher_open_course_merge_resources_question_id bigint COMMENT '开课题目ID'; -ALTER TABLE teacher_open_course_question_log ADD COLUMN question_analysis varchar(1000) COMMENT '解析'; \ No newline at end of file +ALTER TABLE teacher_open_course_question_log ADD COLUMN question_analysis varchar(1000) COMMENT '解析'; +ALTER TABLE teacher_open_course_question_log ADD COLUMN is_tuck int(2) default 0 COMMENT '是否收藏'; + diff --git a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskOneQuestion.java b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskOneQuestion.java index e4d94135..77a22f89 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskOneQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskOneQuestion.java @@ -28,7 +28,7 @@ public class CompetitionTaskOneQuestion extends BaseEntity{ private Long competitionStudentsId ; - //题型(1单选 2多选 3判断) + //题型(1单选 2多选 3判断 4填空 5分析) private Integer questionType ; @@ -126,13 +126,13 @@ public class CompetitionTaskOneQuestion extends BaseEntity{ this.competitionStudentsId = competitionStudentsId; } - /**题型(1单选 2多选 3判断) + /**题型(1单选 2多选 3判断 4填空 5分析) *@return */ public Integer getQuestionType(){ return questionType; } - /**题型(1单选 2多选 3判断) + /**题型(1单选 2多选 3判断 4填空 5分析) *@param questionType */ public void setQuestionType(Integer questionType){ diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskOneQuestion.java b/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskOneQuestion.java index 09ad8d72..9cb699e4 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskOneQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskOneQuestion.java @@ -28,7 +28,7 @@ public class ExamTaskOneQuestion extends BaseEntity{ private Long examStudentsId ; - //题型(1单选 2多选 3判断) + //题型(1单选 2多选 3判断 4填空 5分析) private Integer questionType ; @@ -126,13 +126,13 @@ public class ExamTaskOneQuestion extends BaseEntity{ this.examStudentsId = examStudentsId; } - /**题型(1单选 2多选 3判断) + /**题型(1单选 2多选 3判断 4填空 5分析) *@return */ public Integer getQuestionType(){ return questionType; } - /**题型(1单选 2多选 3判断) + /**题型(1单选 2多选 3判断 4填空 5分析) *@param questionType */ public void setQuestionType(Integer questionType){ diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestion.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestion.java index 6e319f71..ef5a7516 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestion.java @@ -24,7 +24,7 @@ public class ResourcesQuestion extends BaseEntity{ private Long courseInfoId ; - //题型(1单选 2多选 3判断) + //题型(1单选 2多选 3判断 4填空 5分析) private Integer questionType ; @@ -108,13 +108,13 @@ public class ResourcesQuestion extends BaseEntity{ this.courseInfoId = courseInfoId; } - /**题型(1单选 2多选 3判断) + /**题型(1单选 2多选 3判断 4填空 5分析) *@return */ public Integer getQuestionType(){ return questionType; } - /**题型(1单选 2多选 3判断) + /**题型(1单选 2多选 3判断 4) *@param questionType */ public void setQuestionType(Integer questionType){ diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestionSnapshot.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestionSnapshot.java index 11cf6ab9..f66244b5 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestionSnapshot.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestionSnapshot.java @@ -33,7 +33,7 @@ public class ResourcesQuestionSnapshot extends BaseEntity{ //开课题目ID 回显用 private Long teacherOpenCourseMergeResourcesQuestionId ; - //题型(1单选 2多选 3判断) + //题型(1单选 2多选 3判断 4填空 5分析) private Integer questionType ; @@ -115,13 +115,13 @@ public class ResourcesQuestionSnapshot extends BaseEntity{ this.teacherOpenCourseQuestionSettingId = teacherOpenCourseQuestionSettingId; } - /**题型(1单选 2多选 3判断) + /**题型(1单选 2多选 3判断 4填空 5分析) *@return */ public Integer getQuestionType(){ return questionType; } - /**题型(1单选 2多选 3判断) + /**题型(1单选 2多选 3判断 4填空 5分析) *@param questionType */ public void setQuestionType(Integer questionType){ diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java index ab9c6309..129265bb 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java @@ -113,13 +113,13 @@ public class TeacherOpenCourseMergeResourcesQuestion extends BaseEntity{ this.teacherOpenCourseId = teacherOpenCourseId; } - /**题型(1单选 2多选 3判断) + /**题型(1单选 2多选 3判断 4填空 5分析) *@return */ public Integer getQuestionType(){ return questionType; } - /**题型(1单选 2多选 3判断) + /**题型(1单选 2多选 3判断 4填空 5分析) *@param questionType */ public void setQuestionType(Integer questionType){ diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLog.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLog.java index bc8f6a80..0e16e2df 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLog.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLog.java @@ -1,10 +1,13 @@ package com.ibeetl.jlw.entity; +import cn.hutool.core.util.EnumUtil; import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; +import com.ibeetl.jlw.enums.ResourcesQuestionTypeEnum; import lombok.Data; import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.ObjectUtils; import org.beetl.sql.annotation.entity.AssignID; import org.beetl.sql.fetch.annotation.Fetch; @@ -67,7 +70,7 @@ public class TeacherOpenCourseQuestionLog extends BaseEntity{ private Long courseInfoId ; - //题型(1单选 2多选 3判断) + //题型(1单选 2多选 3判断 4填空 5分析) private Integer questionType ; @@ -107,6 +110,10 @@ public class TeacherOpenCourseQuestionLog extends BaseEntity{ private String questionAnalysis ; + //是否收藏 + + private Boolean isTuck ; + //组织ID private Long orgId ; @@ -115,4 +122,10 @@ public class TeacherOpenCourseQuestionLog extends BaseEntity{ private Long userId ; + public void setQuestionType(Integer questionType) { + this.questionType = questionType; + if (ObjectUtils.isNotEmpty(questionType)) { + this.set("questionTypeText", EnumUtil.likeValueOf(ResourcesQuestionTypeEnum.class, questionType).getText()); + } + } } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLogWrong.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLogWrong.java index 162b4535..9756dcd2 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLogWrong.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLogWrong.java @@ -51,7 +51,7 @@ public class TeacherOpenCourseQuestionLogWrong extends BaseEntity{ private Long studentId ; - //题型(1单选 2多选 3判断) + //题型(1单选 2多选 3判断 4填空 5分析) private Integer questionType ; @@ -202,13 +202,13 @@ public class TeacherOpenCourseQuestionLogWrong extends BaseEntity{ this.studentId = studentId; } - /**题型(1单选 2多选 3判断) + /**题型(1单选 2多选 3判断 4填空 5分析) *@return */ public Integer getQuestionType(){ return questionType; } - /**题型(1单选 2多选 3判断) + /**题型(1单选 2多选 3判断 4填空 5分析) *@param questionType */ public void setQuestionType(Integer questionType){ diff --git a/web/src/main/java/com/ibeetl/jlw/entity/vo/TeacherOpenCourseQuestionTestSimpleInfoVO.java b/web/src/main/java/com/ibeetl/jlw/entity/vo/TeacherOpenCourseQuestionTestSimpleInfoVO.java index e5f16cc1..cda037b3 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/vo/TeacherOpenCourseQuestionTestSimpleInfoVO.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/vo/TeacherOpenCourseQuestionTestSimpleInfoVO.java @@ -1,5 +1,6 @@ package com.ibeetl.jlw.entity.vo; +import com.ibeetl.admin.core.entity.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,7 +11,7 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper=false) -public class TeacherOpenCourseQuestionTestSimpleInfoVO { +public class TeacherOpenCourseQuestionTestSimpleInfoVO extends BaseEntity { //开课题目配置ID diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java index ce992a6b..366531b1 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java @@ -36,6 +36,8 @@ import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; import static cn.hutool.core.util.ArrayUtil.join; import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUserId; @@ -462,4 +464,22 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService stringTeacherOpenCourseQuestionLogFunction = logId -> { + TeacherOpenCourseQuestionLog questionLog = new TeacherOpenCourseQuestionLog(); + questionLog.setTeacherOpenCourseQuestionLogId(Long.valueOf(logId)); + questionLog.setIsTuck(isTuck); + return questionLog; + }; + List logSet = Arrays.asList(teacherOpenCourseQuestionLogIds.split(",")).stream() + .map(stringTeacherOpenCourseQuestionLogFunction).collect(Collectors.toList()); + + updateBatchTemplate(logSet); + } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java index bd4244be..e6733185 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java @@ -1,16 +1,21 @@ package com.ibeetl.jlw.web; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.StrUtil; import cn.jlw.Interceptor.SCoreUser; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.annotation.Function; import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.file.FileService; +import com.ibeetl.admin.core.util.BeanCopyUtil; import com.ibeetl.admin.core.web.JsonResult; +import com.ibeetl.admin.core.web.query.PageParam; import com.ibeetl.jlw.entity.Student; import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLog; import com.ibeetl.jlw.service.TeacherOpenCourseQuestionLogService; import com.ibeetl.jlw.web.query.TeacherOpenCourseQuestionLogQuery; +import lombok.SneakyThrows; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -21,13 +26,18 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; +import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.NotNull; import java.math.BigDecimal; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.TreeSet; import static cn.jlw.util.CacheUserUtil.getStudent; +import static com.ibeetl.admin.core.util.ExcelUtil.convertData; +import static com.ibeetl.admin.core.util.ExcelUtil.write; +import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUser; /** * 题目日志 我的课程-题库-做题日志 接口 @@ -177,6 +187,71 @@ public class TeacherOpenCourseQuestionLogController { return JsonResult.success(page); } + /** + * 批量收藏题目 / 取消收藏 + * @param teacherOpenCourseQuestionLogIds 题目日志ID + * @param isTuck 是否收藏：true, false + * @return + */ + @PostMapping(API + "/tuck.do") + public JsonResult tuck(String teacherOpenCourseQuestionLogIds, boolean isTuck) { + teacherOpenCourseQuestionLogService.tuck(teacherOpenCourseQuestionLogIds, isTuck); + return JsonResult.success(); + } + + /** + * 查询收藏题目 + * @return + */ + @GetMapping(API + "/tuckList.do") + public JsonResult tuckList(PageParam pageParam) { + Student student = getStudent(); + Assert.notNull(student, "非学生身份，无法获取题目分析!"); + PageQuery query = new PageQuery(pageParam.getPage().longValue(), pageParam.getLimit().longValue()); + query.setPara("studentId", student.getStudentId()); + query.setPara("teacherOpenCourseQuestionLogStatus", 1); + return JsonResult.success(teacherOpenCourseQuestionLogService.queryByConditionQuery(query)); + } + + /** + * 教师端-签到日志导出 + * @param condition 日志记录查询条件 + * @return + */ + @SneakyThrows + @PostMapping(API + "/export.do") + public void tuckExport(HttpServletResponse resp, TeacherOpenCourseQuestionLogQuery condition) { + + Assert.notNull(getUser(), "请登录后再操作"); + + /** 构建表头 */ + Map header = new LinkedHashMap<>(11); + header.put("teacherOpenCourseQuestionSettingIdText", "开课题目名称"); + header.put("questionStem", "题干"); + header.put("questionTypeText", "题型"); + header.put("questionScore", "题目分值"); + header.put("questionOptionA", "选项A"); + header.put("questionOptionB", "选项B"); + header.put("questionOptionC", "选项C"); + header.put("questionOptionD", "选项D"); + header.put("questionOptionE", "选项E"); + header.put("questionAnswer", "答案"); + header.put("questionAnalysis", "解析"); + + // 当前导出的是学生的话，那么只导出他自己的 + Student student = getStudent(); + if (student != null) { + condition.setStudentId(student.getStudentId()); + } + + List datas = + teacherOpenCourseQuestionLogService.getValuesByQueryNotWithPermission(condition); + + List> maps = BeanCopyUtil.baseEntity2MapWithParallel(datas); + + String filename = StrUtil.format("题目收藏-导出 {}.xlsx", DateUtil.formatDate(DateUtil.date())); + write(resp, filename,"Sheet1", header.values(), convertData(header.keySet(), maps)); + } /* 后台页面 */ @@ -292,12 +367,4 @@ public class TeacherOpenCourseQuestionLogController { teacherOpenCourseQuestionLogService.deleteTeacherOpenCourseQuestionLog(ids); return JsonResult.success(); } - - /** - * 学生端-教师端-单个学生做题日志详情 - * 转到 {@link #list(TeacherOpenCourseQuestionLogQuery condition)} - * @param condition 题目配置ID - * @return - */ - } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/CompetitionTaskOneQuestionQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/CompetitionTaskOneQuestionQuery.java index 6c345e06..908a1cf4 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/CompetitionTaskOneQuestionQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/CompetitionTaskOneQuestionQuery.java @@ -1,14 +1,10 @@ package com.ibeetl.jlw.web.query; -import com.ibeetl.jlw.entity.CompetitionTaskOneQuestion; -import org.apache.commons.lang3.StringUtils; import com.ibeetl.admin.core.annotation.Query; -import com.ibeetl.admin.core.util.Tool; -import com.ibeetl.admin.core.util.enums.CoreDictType; import com.ibeetl.admin.core.web.query.PageParam; +import com.ibeetl.jlw.entity.CompetitionTaskOneQuestion; import java.math.BigDecimal; -import java.util.Date; /** *CompetitionTaskOneQuestion查询 @@ -20,7 +16,7 @@ public class CompetitionTaskOneQuestionQuery extends PageParam { private Long competitionId; @Query(name = "参赛学生ID", display = true) private Long competitionStudentsId; - @Query(name = "题型(1单选 2多选 3判断)", display = true) + @Query(name = "题型(1单选 2多选 3判断 4填空 5分析)", display = true) private Integer questionType; @Query(name = "分值", display = true) private BigDecimal questionScore; diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/ExamTaskOneQuestionQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/ExamTaskOneQuestionQuery.java index 43172e25..c95fb3a4 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/ExamTaskOneQuestionQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/ExamTaskOneQuestionQuery.java @@ -1,14 +1,10 @@ package com.ibeetl.jlw.web.query; -import com.ibeetl.jlw.entity.ExamTaskOneQuestion; -import org.apache.commons.lang3.StringUtils; import com.ibeetl.admin.core.annotation.Query; -import com.ibeetl.admin.core.util.Tool; -import com.ibeetl.admin.core.util.enums.CoreDictType; import com.ibeetl.admin.core.web.query.PageParam; +import com.ibeetl.jlw.entity.ExamTaskOneQuestion; import java.math.BigDecimal; -import java.util.Date; /** *ExamTaskOneQuestion查询 @@ -20,7 +16,7 @@ public class ExamTaskOneQuestionQuery extends PageParam { private Long examId; @Query(name = "参考学生ID", display = true) private Long examStudentsId; - @Query(name = "题型(1单选 2多选 3判断)", display = true) + @Query(name = "题型(1单选 2多选 3判断 4填空 5分析)", display = true) private Integer questionType; @Query(name = "分值", display = true) private BigDecimal questionScore; diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionQuery.java index b2ec0075..8376e994 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionQuery.java @@ -17,7 +17,7 @@ public class ResourcesQuestionQuery extends PageParam { private Long resourcesQuestionId; @Query(name = "课程ID", display = false) private Long courseInfoId; - @Query(name = "题型(1单选 2多选 3判断)", display = false) + @Query(name = "题型(1单选 2多选 3判断 4填空 5分析)", display = false) private Integer questionType; @Query(name = "分值", display = false) private BigDecimal questionScore; diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java index a7d11280..41ff70d3 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java @@ -25,7 +25,7 @@ public class ResourcesQuestionSnapshotQuery extends PageParam { private Long teacherOpenCourseMergeCourseInfoId; @Query(name = "开课题目ID", display = false) private Long teacherOpenCourseMergeResourcesQuestionId; - @Query(name = "题型(1单选 2多选 3判断)", display = false) + @Query(name = "题型(1单选 2多选 3判断 4填空 5分析)", display = false) private Integer questionType; @Query(name = "分值", display = false) private BigDecimal questionScore; diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionLogQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionLogQuery.java index ead5fa6e..402f3554 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionLogQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionLogQuery.java @@ -48,7 +48,7 @@ public class TeacherOpenCourseQuestionLogQuery extends PageParam { private Long courseInfoId ; - //题型(1单选 2多选 3判断) + //题型(1单选 2多选 3判断 4填空 5分析) private Integer questionType ; @@ -88,6 +88,10 @@ public class TeacherOpenCourseQuestionLogQuery extends PageParam { private String questionAnalysis ; + //是否收藏 + + private Boolean isTuck ; + private String teacherOpenCourseQuestionLogIdPlural; private String teacherOpenCourseQuestionSettingIdPlural; private String resourcesQuestionSnapshotIdPlural; @@ -125,6 +129,7 @@ public class TeacherOpenCourseQuestionLogQuery extends PageParam { pojo.setQuestionOptionE(this.getQuestionOptionE()); pojo.setQuestionAnswer(this.getQuestionAnswer()); pojo.setQuestionAnalysis(this.getQuestionAnalysis()); + pojo.setIsTuck(this.getIsTuck()); return pojo; } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionLogWrongQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionLogWrongQuery.java index 9d2d2c1a..662db1ae 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionLogWrongQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionLogWrongQuery.java @@ -30,7 +30,7 @@ public class TeacherOpenCourseQuestionLogWrongQuery extends PageParam { private Integer teacherOpenCourseQuestionLogStatus; @Query(name = "学生ID", display = false) private Long studentId; - @Query(name = "题型(1单选 2多选 3判断)", display = false) + @Query(name = "题型(1单选 2多选 3判断 4填空 5分析)", display = false) private Integer questionType; @Query(name = "分值", display = false) private BigDecimal questionScore; diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md b/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md index 9bd595df..059a2e73 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md @@ -84,6 +84,9 @@ queryByCondition @if(!isEmpty(questionAnswer)){ and t.question_answer =#questionAnswer# @} + @if(!isEmpty(isTuck)){ + and t.is_tuck =#isTuck# + @} @if(!isEmpty(orgId)){ and t.org_id =#orgId# @} @@ -182,6 +185,9 @@ queryByConditionQuery @if(!isEmpty(questionAnswer)){ and t.question_answer =#questionAnswer# @} + @if(!isEmpty(isTuck)){ + and t.is_tuck =#isTuck# + @} @if(!isEmpty(orgId)){ and t.org_id =#orgId# @} @@ -288,6 +294,9 @@ studentScoreList @if(!isEmpty(questionAnswer)){ and t.question_answer =#questionAnswer# @} + @if(!isEmpty(isTuck)){ + and t.is_tuck =#isTuck# + @} @if(!isEmpty(orgId)){ and t.org_id =#orgId# @} @@ -402,6 +411,13 @@ updateGivenByIds student_id = #studentId# , @} @} + @if(contain("isTuck",_given)){ + @if(isEmpty(isTick)){ + is_tuck = null , + @}else{ + is_tuck = #isTuck# , + @} + @} @if(contain("orgId",_given)){ @if(isEmpty(orgId)){ org_id = null , @@ -455,6 +471,9 @@ getTeacherOpenCourseQuestionLogValues @if(!isEmpty(studentId)){ and t.student_id =#studentId# @} + @if(!isEmpty(isTuck)){ + and t.is_tuck =#isTuck# + @} @if(!isEmpty(orgId)){ and t.org_id =#orgId# @} @@ -513,6 +532,9 @@ getValuesByQuery @if(!isEmpty(studentIdPlural)){ and find_in_set(t.student_id,#studentIdPlural#) @} + @if(!isEmpty(isTuck)){ + and t.is_tuck =#isTuck# + @} @if(!isEmpty(orgId)){ and t.org_id =#orgId# @} @@ -577,6 +599,9 @@ getValuesByQueryNotWithPermission @if(!isEmpty(studentIdPlural)){ and find_in_set(t.student_id,#studentIdPlural#) @} + @if(!isEmpty(isTuck)){ + and t.is_tuck =#isTuck# + @} @if(!isEmpty(orgId)){ and t.org_id =#orgId# @}