From 98c10189741547556a3a6b49c25280fb273af3ab Mon Sep 17 00:00:00 2001 From: yaodan <1421553879@qq.com> Date: Mon, 29 May 2023 01:16:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E6=95=B0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/题库导入模板.xlsx | Bin 10705 -> 10894 bytes .../TeacherOpenCourseQuestionSettingDao.java | 2 + ...enCourseHandsOnSimulationTasksService.java | 61 ++++++------ .../TeacherOpenCourseQuestionLogService.java | 23 ++++- ...eacherOpenCourseScoreDashboardService.java | 19 ++-- ...eacherOpenCourseQuestionLogController.java | 2 +- .../web/query/QuestionLogSummaryQuery.java | 11 ++- .../jlw/web/query/StudentScoreParam.java | 3 +- .../TeacherOpenCourseQuestionLogQuery.java | 4 + .../resources/sql/jlw/questionLogSummary.md | 3 + .../sql/jlw/teacherOpenCourseQuestionLog.md | 21 +++- .../jlw/teacherOpenCourseQuestionSetting.md | 90 ++++++++++++++++++ 12 files changed, 197 insertions(+), 42 deletions(-) diff --git a/web/filesystem/template/题库导入模板.xlsx b/web/filesystem/template/题库导入模板.xlsx index ddea7517f3d68efc2e2268399a6dddbd361a5c09..7a16c3c3baf7772c6bcad9ebc60b22a6a65f23b4 100644 GIT binary patch delta 3172 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 bhp-Z|S%nEova$?^>;zX?S!Nm7AHshCYtm}x diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionSettingDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionSettingDao.java index e413b17d..55612246 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionSettingDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionSettingDao.java @@ -83,4 +83,6 @@ public interface TeacherOpenCourseQuestionSettingDao extends BaseMapper queryByConditionQueryNotPage(TeacherOpenCourseQuestionSettingQuery condition); + + List getNotEmptyQuestionSetting(TeacherOpenCourseQuestionSettingQuery teacherOpenCourseQuestionSettingQuery); } diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java index d2bc5106..37057421 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java @@ -443,22 +443,24 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ } public PageQuery getStudentScore(StudentScoreParam studentScoreParam) { + Long handsOnId = studentScoreParam.getHandsOnId(); - if (handsOnId != null) { - TeacherOpenCourseHandsOnQuery handsOnQuery = new TeacherOpenCourseHandsOnQuery(); - handsOnQuery.setHandsOnId(handsOnId); - List handsOns = teacherOpenCourseHandsOnDao.getValuesByQueryNotWithPermission(handsOnQuery); - Long teacherOpenCourseId = handsOns.get(0).getTeacherOpenCourseId(); - List select = teacherOpenCourseMergeStudentService.createLambdaQuery() - .andEq(TeacherOpenCourseMergeSchoolClass::getTeacherOpenCourseId, teacherOpenCourseId).andEq(TeacherOpenCourseMergeSchoolClass::getTeacherOpenCourseMergeSchoolClassStatus, 1).select(); - if (CollectionUtil.isNotEmpty(select)) { - List collect = select.stream().map(TeacherOpenCourseMergeSchoolClass::getSchoolClassId).collect(Collectors.toList()); - String join = CollectionUtil.join(collect, ","); - studentScoreParam.setClassIds(join); - } + if (handsOnId == null) { + throw new PlatformException("请选择实操任务"); + } + TeacherOpenCourseHandsOnQuery handsOnQuery = new TeacherOpenCourseHandsOnQuery(); + handsOnQuery.setHandsOnId(handsOnId); + List handsOns = teacherOpenCourseHandsOnDao.getValuesByQueryNotWithPermission(handsOnQuery); + Long teacherOpenCourseId = handsOns.get(0).getTeacherOpenCourseId(); + List select = teacherOpenCourseMergeStudentService.createLambdaQuery() + .andEq(TeacherOpenCourseMergeSchoolClass::getTeacherOpenCourseId, teacherOpenCourseId).andEq(TeacherOpenCourseMergeSchoolClass::getTeacherOpenCourseMergeSchoolClassStatus, 1).select(); + if (CollectionUtil.isNotEmpty(select)) { + List collect = select.stream().map(TeacherOpenCourseMergeSchoolClass::getSchoolClassId).collect(Collectors.toList()); + String join = CollectionUtil.join(collect, ","); + studentScoreParam.setClassIds(join); } PageQuery pageQuery = studentScoreParam.getPageQuery(); - pageQuery.setPara("studentStatus",1); + pageQuery.setPara("studentStatus", 1); PageQuery studentPageQuery = studentService.queryByCondition(pageQuery); List list = studentPageQuery.getList(); @@ -466,9 +468,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ for (Student student : list) { StudentHandsOnTaskVideoQuery studentHandsOnTaskVideoQuery = new StudentHandsOnTaskVideoQuery(); studentHandsOnTaskVideoQuery.setStudentId(student.getStudentId()); - if (handsOnId != null) { - studentHandsOnTaskVideoQuery.setHandsOnId(handsOnId); - } + studentHandsOnTaskVideoQuery.setHandsOnId(handsOnId); List valuesByQuery = studentHandsOnTaskVideoService.getValuesByQuery(studentHandsOnTaskVideoQuery); double sum = valuesByQuery.stream().mapToDouble(v -> v.getVideoScore() == null ? 0 : v.getVideoScore().doubleValue()).sum(); student.set("sumScore", sum); @@ -478,9 +478,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ for (Student student : list) { StudentHandsOnTaskPptQuery studentHandsOnTaskPptQuery = new StudentHandsOnTaskPptQuery(); studentHandsOnTaskPptQuery.setStudentId(student.getStudentId()); - if (handsOnId != null) { - studentHandsOnTaskPptQuery.setHandsOnId(handsOnId); - } + studentHandsOnTaskPptQuery.setHandsOnId(handsOnId); List valuesByQuery = studentHandsOnTaskPptService.getValuesByQuery(studentHandsOnTaskPptQuery); double sum = valuesByQuery.stream().mapToDouble(v -> v.getPptScore() == null ? 0 : v.getPptScore().doubleValue()).sum(); student.set("sumScore", sum); @@ -490,9 +488,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ for (Student student : list) { StudentHandsOnTaskTheoryQuery studentHandsOnTaskTheoryQuery = new StudentHandsOnTaskTheoryQuery(); studentHandsOnTaskTheoryQuery.setStudentId(student.getStudentId()); - if (handsOnId != null) { - studentHandsOnTaskTheoryQuery.setHandsOnId(handsOnId); - } + studentHandsOnTaskTheoryQuery.setHandsOnId(handsOnId); List valuesByQuery = studentHandsOnTaskTheoryService.getValuesByQuery(studentHandsOnTaskTheoryQuery); double sum = valuesByQuery.stream().mapToDouble(v -> v.getTheoryScore() == null ? 0 : v.getTheoryScore().doubleValue()).sum(); student.set("sumScore", sum); @@ -502,9 +498,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ for (Student student : list) { StudentHandsOnTaskStepQuery studentHandsOnTaskStepQuery = new StudentHandsOnTaskStepQuery(); studentHandsOnTaskStepQuery.setStudentId(student.getStudentId()); - if (handsOnId != null) { - studentHandsOnTaskStepQuery.setHandsOnId(handsOnId); - } + studentHandsOnTaskStepQuery.setHandsOnId(handsOnId); List valuesByQuery = studentHandsOnTaskStepService.getValuesByQuery(studentHandsOnTaskStepQuery); double sum = valuesByQuery.stream().mapToDouble(v -> v.getTheoryScore() == null ? 0 : v.getTheoryScore().doubleValue()).sum(); student.set("sumScore", sum); @@ -514,14 +508,25 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ for (Student student : list) { StudentHandsOnTaskReportQuery studentHandsOnTaskReportQuery = new StudentHandsOnTaskReportQuery(); studentHandsOnTaskReportQuery.setStudentId(student.getStudentId()); - if (handsOnId != null) { - studentHandsOnTaskReportQuery.setHandsOnId(handsOnId); - } + studentHandsOnTaskReportQuery.setHandsOnId(handsOnId); List valuesByQuery = studentHandsOnTaskReportService.getValuesByQuery(studentHandsOnTaskReportQuery); double sum = valuesByQuery.stream().mapToDouble(v -> v.getReportScore() == null ? 0 : v.getReportScore().doubleValue()).sum(); student.set("sumScore", sum); } } + if ("ALL".equals(studentScoreParam.getType())) { + for (Student student : list) { + HandsOnAchievement handsOnAchievement = new HandsOnAchievement(); + handsOnAchievement.setStudentId(student.getStudentId()); + handsOnAchievement.setHandOnId(handsOnId); + handsOnAchievement.setHandOnAchievementStatus(1); + HandsOnAchievement res = studentHandsOnTaskReportService.queryObject(handsOnAchievement); + String totalScore = res.getTotalScore(); + student.set("sumScore", totalScore); + } + } + + studentPageQuery.setList(list); return studentPageQuery; } 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 72a8f569..0ec86420 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java @@ -344,7 +344,7 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService updateList = teacherOpenCourseQuestionLogDao.getValuesByQueryNotWithPermission(teacherOpenCourseQuestionLogQuery); Assert.notEmpty(updateList, "未查询到做题记录！"); @@ -451,13 +451,30 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService teacherOpenCourseQuestionLogList = queryObjectList(teacherOpenCourseQuestionLog); + if (CollectionUtil.isNotEmpty(teacherOpenCourseQuestionLogList)) { + teacherOpenCourseQuestionLogList.forEach(log -> { + log.setTeacherOpenCourseQuestionLogStatus(GlobalStatusEnum.DELETED.getCode()); + log.setTeacherOpenCourseQuestionLogUpdateTime(new Date()); + }); + updateBatchTemplate(teacherOpenCourseQuestionLogList); + } + // 重新添加最新的数据 Date now = new Date(); TeacherOpenCourseQuestionLogQuery query = new TeacherOpenCourseQuestionLogQuery(); query.setTeacherOpenCourseQuestionLogUploadFile(absFilePath); query.setTeacherOpenCourseQuestionSettingId(questionSettingId); query.setTeacherOpenCourseQuestionLogAddTime(now); query.setTeacherOpenCourseQuestionLogFinishTime(RandomUtil.randomLong(100, 3600)); - query.setTeacherOpenCourseQuestionLogStatus(1); + query.setTeacherOpenCourseQuestionLogStatus(GlobalStatusEnum.NORMAL.getCode()); // 附件作业，只有一题，所有默认是全部提交的方式 query.setQuestionLogAddType(FINALLY_SUBMIT); query.setOrgId(student.getOrgId()); @@ -1230,6 +1247,8 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService teacherOpenCourseChatLogList = teacherOpenCourseChatLogService.queryObjectList(teacherOpenCourseChatLog); - //查询章节练习配置 - List chapterExerciseList = teacherOpenCourseQuestionSettingDao.createLambdaQuery() - .andEq(TeacherOpenCourseQuestionSetting::getTeacherOpenCourseId, teacherOpenCourseId) - .andEq(TeacherOpenCourseQuestionSetting::getTeacherOpenCourseQuestionSettingType, ResourcesQuestionSnapshotFromTypeEnum.CHAPTER_EXERCISE) - .andEq(TeacherOpenCourseQuestionSetting::getTeacherOpenCourseQuestionSettingStatus, 1).select(); - + //查询章节练习配置,查有题目的，上架的 + TeacherOpenCourseQuestionSettingQuery teacherOpenCourseQuestionSettingQuery = new TeacherOpenCourseQuestionSettingQuery(); + teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseId(teacherOpenCourseId); + teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingType(ResourcesQuestionSnapshotFromTypeEnum.CHAPTER_EXERCISE); + teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingStatus(1); + List chapterExerciseList = teacherOpenCourseQuestionSettingDao.getNotEmptyQuestionSetting(teacherOpenCourseQuestionSettingQuery); //查询本课程的所有实操任务 TeacherOpenCourseHandsOn param = new TeacherOpenCourseHandsOn(); @@ -502,13 +504,16 @@ public class TeacherOpenCourseScoreDashboardService extends CoreBaseService examList = teacherOpenCourseQuestionSettingDao.createLambdaQuery() .andEq(TeacherOpenCourseQuestionSetting::getTeacherOpenCourseId, teacherOpenCourseId) .andEq(TeacherOpenCourseQuestionSetting::getTeacherOpenCourseQuestionSettingStatus, 1) - .andEq(TeacherOpenCourseQuestionSetting::getTeacherOpenCourseQuestionSettingType, ResourcesQuestionSnapshotFromTypeEnum.EXAM).select(); + .andEq(TeacherOpenCourseQuestionSetting::getTeacherOpenCourseQuestionSettingType, ResourcesQuestionSnapshotFromTypeEnum.EXAM) + .andEq(TeacherOpenCourseQuestionSetting::getTeacherOpenCourseQuestionSettingPushStatus, GlobalPushStatusEnum.PUSH) + .select(); //查询权重 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 79b67b71..7a32d179 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java @@ -193,7 +193,7 @@ public class TeacherOpenCourseQuestionLogController extends BaseController { /** - * 教师端-手动批改一些题目的分数 + * 教师端-手动批改一些题目的分数,这里被附件作业评阅调用了 * * @param questionSettingId 题目配置ID * @param studentId 学生ID diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/QuestionLogSummaryQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/QuestionLogSummaryQuery.java index acaa6ef9..f3498365 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/QuestionLogSummaryQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/QuestionLogSummaryQuery.java @@ -66,8 +66,9 @@ public class QuestionLogSummaryQuery extends PageParam { private String personIdPlural; private String questionLogSummaryStatusPlural; private String orgIdPlural; - private String userIdPlural; + private Long studentId; + private String userIdPlural; private String questionLogSummaryJsonStr;//json格式 private String _given;//指定更新的特定字段，多个逗号隔开 @@ -309,4 +310,12 @@ public class QuestionLogSummaryQuery extends PageParam { public void setSchoolClassIdPlural(String schoolClassIdPlural) { this.schoolClassIdPlural = schoolClassIdPlural; } + + public Long getStudentId() { + return studentId; + } + + public void setStudentId(Long studentId) { + this.studentId = studentId; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/StudentScoreParam.java b/web/src/main/java/com/ibeetl/jlw/web/query/StudentScoreParam.java index f61a91ae..5a50eb2b 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/StudentScoreParam.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/StudentScoreParam.java @@ -1,6 +1,5 @@ package com.ibeetl.jlw.web.query; -import com.ibeetl.admin.core.web.query.PageParam; import lombok.Data; /** @@ -24,7 +23,7 @@ public class StudentScoreParam extends StudentQuery { private Long classId; /** - * 1:视频 2:ppt 3:理论 4:实操 5:报告 + * 1:视频 2:ppt 3:理论 4:实操 5:报告,All:全部 */ private String type; 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 17eb82d0..62921fb6 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 @@ -134,6 +134,10 @@ public class TeacherOpenCourseQuestionLogQuery extends PageParam { private String schoolClassIdPlural; + private Long schoolClassId; + + private String studentOrName; + // 题目配置来源类型 private ResourcesQuestionSnapshotFromTypeEnum questionSettingType; diff --git a/web/src/main/resources/sql/jlw/questionLogSummary.md b/web/src/main/resources/sql/jlw/questionLogSummary.md index d460edd8..9f8ef287 100644 --- a/web/src/main/resources/sql/jlw/questionLogSummary.md +++ b/web/src/main/resources/sql/jlw/questionLogSummary.md @@ -146,6 +146,9 @@ queryByConditionQuery @if(!isEmpty(personId)){ and t.person_id =#personId# @} + @if(!isEmpty(studentId)){ + and t.person_id =#studentId# + @} @if(!isEmpty(personIdPlural)){ and find_in_set(t.person_id,#personIdPlural#) @} diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md b/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md index 192ff50f..3fba003d 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md @@ -181,6 +181,8 @@ queryByConditionQuery and qls.person_id =t.student_id @} and qls.question_log_summary_status=1 + order by qls.question_log_summary_add_time desc + limit 1 ) ) @} @@ -327,7 +329,22 @@ studentScoreList LEFT JOIN student ta ON ta.student_id = t.student_id WHERE 1 = 1 - AND ta.student_sn IS NOT NULL + @// AND ta.student_sn IS NOT NULL + @if(!isEmpty(questionSettingType)&&questionSettingType=="HOMEWORK_FILE"){ + @//附件作业不需要查，因为没评阅之前，是没有成绩表数据的，只需要查status=1的数据，逻辑保证了只有一条 + and t.teacher_open_course_question_log_status = 1 + @}else{ + @//不这么写会把多次考试的分数都加起来 + AND find_in_set(t.teacher_open_course_question_log_id ,( + select question_log_ids from (select question_log_ids from question_log_summary qls where qls.question_setting_id = t.teacher_open_course_question_setting_id and qls.person_id = t.student_id and qls.question_log_summary_status=1 order by qls.question_log_summary_add_time desc limit 1) tt + )) + @} + @if(!isEmpty(schoolClassId)){ + and ta.class_id =#schoolClassId# + @} + @if(!isEmpty(studentOrName)){ + and (ta.student_sn like #'%'+studentOrName+'%'# or ta.student_name like #'%'+studentOrName+'%'#) + @} @if(!isEmpty(teacherOpenCourseQuestionLogId)){ and t.teacher_open_course_question_log_id =#teacherOpenCourseQuestionLogId# @} @@ -1107,6 +1124,8 @@ getPageList and qls.person_id =t.student_id @} and qls.question_log_summary_status=1 + order by qls.question_log_summary_add_time desc + limit 1 ) ) @} diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md b/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md index c6327330..981822e3 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md @@ -774,3 +774,93 @@ queryByConditionQueryNotPage @} ORDER BY CONVERT(regexp_replace ( t.teacher_open_course_question_setting_name, '[^0-9]+', '' ),unsigned) asc + + + +getNotEmptyQuestionSetting +=== + * 查询不为空的题目配置 + select + t.* + from teacher_open_course_question_setting t + where 1=1 + @//题目不为空 + and ( SELECT count( 1 ) FROM resources_question_snapshot tb WHERE tb.teacher_open_course_question_setting_id = t.teacher_open_course_question_setting_id AND tb.question_status = 1 ) > 1 + @if(!isEmpty(teacherOpenCourseQuestionSettingId)){ + and t.teacher_open_course_question_setting_id =#teacherOpenCourseQuestionSettingId# + @} + @if(!isEmpty(teacherOpenCourseQuestionSettingIdPlural)){ + and find_in_set(t.teacher_open_course_question_setting_id,#teacherOpenCourseQuestionSettingIdPlural#) + @} + @if(!isEmpty(teacherOpenCourseId)){ + and t.teacher_open_course_id =#teacherOpenCourseId# + @} + @if(!isEmpty(teacherOpenCourseIdPlural)){ + and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#) + @} + @if(!isEmpty(teacherOpenCourseQuestionSettingSchoolClassIds)){ + and t.teacher_open_course_question_setting_school_class_ids =#teacherOpenCourseQuestionSettingSchoolClassIds# + @} + @if(!isEmpty(teacherOpenCourseQuestionSettingDoCount)){ + and t.teacher_open_course_question_setting_do_count =#teacherOpenCourseQuestionSettingDoCount# + @} + @if(!isEmpty(teacherOpenCourseQuestionSettingQuestionNoOrder)){ + and t.teacher_open_course_question_setting_question_no_order =#teacherOpenCourseQuestionSettingQuestionNoOrder# + @} + @if(!isEmpty(teacherOpenCourseQuestionSettingOptionNoOrder)){ + and t.teacher_open_course_question_setting_option_no_order =#teacherOpenCourseQuestionSettingOptionNoOrder# + @} + @if(!isEmpty(teacherOpenCourseQuestionSettingEndShowQa)){ + and t.teacher_open_course_question_setting_end_show_qa =#teacherOpenCourseQuestionSettingEndShowQa# + @} + @if(!isEmpty(teacherOpenCourseQuestionSettingEndShowTrueFalse)){ + and t.teacher_open_course_question_setting_end_show_true_false =#teacherOpenCourseQuestionSettingEndShowTrueFalse# + @} + @if(!isEmpty(teacherOpenCourseQuestionSettingName)){ + and t.teacher_open_course_question_setting_name =#teacherOpenCourseQuestionSettingName# + @} + @if(!isEmpty(teacherOpenCourseQuestionStartTime)){ + and t.teacher_open_course_question_start_time =#teacherOpenCourseQuestionStartTime# + @} + @if(!isEmpty(teacherOpenCourseQuestionEndTime)){ + and t.teacher_open_course_question_end_time =#teacherOpenCourseQuestionEndTime# + @} + @if(!isEmpty(teacherOpenCourseQuestionSettingType)){ + and t.teacher_open_course_question_setting_type =#teacherOpenCourseQuestionSettingType# + @} + @if(!isEmpty(teacherOpenCourseQuestionSettingFile)){ + and t.teacher_open_course_question_setting_file =#teacherOpenCourseQuestionSettingFile# + @} + @if(!isEmpty(teacherOpenCourseQuestionSettingPushStatus)){ + and t.teacher_open_course_question_setting_push_status =#teacherOpenCourseQuestionSettingPushStatus# + @} + @if(isEmpty(teacherOpenCourseQuestionSettingStatus) && isEmpty(teacherOpenCourseQuestionSettingStatusPlural)){ + and t.teacher_open_course_question_setting_status != 2 + @}else{ + @if(!isEmpty(teacherOpenCourseQuestionSettingStatus)){ + and t.teacher_open_course_question_setting_status =#teacherOpenCourseQuestionSettingStatus# + @}else if(!isEmpty(teacherOpenCourseQuestionSettingStatusPlural)){ + and find_in_set(t.teacher_open_course_question_setting_status,#teacherOpenCourseQuestionSettingStatusPlural#) + @} + @} + @if(!isEmpty(teacherOpenCourseQuestionSettingAddTime)){ + and t.teacher_open_course_question_setting_add_time =#teacherOpenCourseQuestionSettingAddTime# + @} + @if(!isEmpty(teacherOpenCourseQuestionSettingRequire)){ + and t.teacher_open_course_question_setting_require =#teacherOpenCourseQuestionSettingRequire# + @} + @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){ + and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId# + @} + @if(!isEmpty(orgId)){ + and t.org_id =#orgId# + @} + @if(!isEmpty(orgIdPlural)){ + and find_in_set(t.org_id,#orgIdPlural#) + @} + @if(!isEmpty(userId)){ + and t.user_id =#userId# + @} + @if(!isEmpty(userIdPlural)){ + and find_in_set(t.user_id,#userIdPlural#) + @}