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 482954eb..e413b17d 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionSettingDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionSettingDao.java @@ -81,4 +81,6 @@ public interface TeacherOpenCourseQuestionSettingDao extends BaseMapper queryByConditionQueryNotPage(TeacherOpenCourseQuestionSettingQuery condition); } diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java index 89c96e80..626612c0 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java @@ -1051,4 +1051,8 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService queryByConditionQueryNotPage(TeacherOpenCourseQuestionSettingQuery condition) { + return teacherOpenCourseQuestionSettingDao.queryByConditionQueryNotPage(condition); + } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java index 6d86f321..ad329ceb 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java @@ -1,5 +1,6 @@ package com.ibeetl.jlw.web; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.jlw.Interceptor.SCoreUser; import cn.jlw.validate.ValidateConfig; @@ -27,10 +28,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import static cn.jlw.util.CacheUserUtil.getStudent; import static com.ibeetl.admin.core.util.ExcelUtil.convertData; @@ -86,22 +84,30 @@ public class TeacherOpenCourseQuestionSettingController { if (condition.getTeacherOpenCourseQuestionSettingType() == null) { throw new PlatformException("参数错误"); } + if (coreUser.isStudent()) { condition.setTeacherOpenCourseQuestionSettingPushStatus(GlobalPushStatusEnum.PUSH); condition.setTeacherOpenCourseQuestionSettingStatus(1); } - condition.setPage(1); - condition.setLimit(Long.MAX_VALUE); - PageQuery page = condition.getPageQuery(); - teacherOpenCourseQuestionSettingService.queryByConditionQuery(page); - String baseName = ""; - for (Object o : page.getList()) { - TeacherOpenCourseQuestionSetting setting = (TeacherOpenCourseQuestionSetting) o; + List list = teacherOpenCourseQuestionSettingService.queryByConditionQueryNotPage(condition); + teacherOpenCourseQuestionSettingService.fullQuestionSettingOptions(list); + if (!condition.getNotSelectOther()) { + // 设置分数和完成时间 + teacherOpenCourseQuestionSettingService.setMyQuestionLogScoreInfo(list, getStudent()); + } + String baseName = ""; + for (TeacherOpenCourseQuestionSetting setting :list) { GlobalPushStatusEnum teacherOpenCourseQuestionSettingPushStatus = setting.getTeacherOpenCourseQuestionSettingPushStatus(); setting.set("teacherOpenCourseQuestionSettingPushStatusText",teacherOpenCourseQuestionSettingPushStatus.getText()); + + String teacherOpenCourseQuestionStartAndEndTime = + ( setting.getTeacherOpenCourseQuestionStartTime()!=null?DateUtil.format(setting.getTeacherOpenCourseQuestionStartTime(),"yyyy-MM-dd HH:mm:ss"):"" ) + + " ~ " + + ( setting.getTeacherOpenCourseQuestionEndTime()!=null?DateUtil.format(setting.getTeacherOpenCourseQuestionEndTime(),"yyyy-MM-dd HH:mm:ss"):"" ); + setting.set("teacherOpenCourseQuestionStartAndEndTime",teacherOpenCourseQuestionStartAndEndTime); } /** 构建表头 */ @@ -112,9 +118,7 @@ public class TeacherOpenCourseQuestionSettingController { case EXAM: header.put("teacherOpenCourseQuestionSettingName", "考试名称"); header.put("teacherOpenCourseQuestionSettingSchoolClassNames", "考试班级"); - header.put("teacherOpenCourseQuestionStartTime", "考试开始时间"); - header.put("teacherOpenCourseQuestionEndTime", "考试结束时间"); - + header.put("teacherOpenCourseQuestionStartAndEndTime", "考试时间"); header.put("avgSuccessCount", "平均答对数量"); header.put("avgErrorCount", "平均答错数量"); header.put("avgSuccessRate", "平均正确率"); @@ -126,8 +130,7 @@ public class TeacherOpenCourseQuestionSettingController { case HOMEWORK_QUESTION: header.put("teacherOpenCourseQuestionSettingName", "题库作业名称"); header.put("teacherOpenCourseQuestionSettingSchoolClassNames", "考试班级"); - header.put("teacherOpenCourseQuestionStartTime", "作业开始时间"); - header.put("teacherOpenCourseQuestionEndTime", "作业结束时间"); + header.put("teacherOpenCourseQuestionStartAndEndTime", "作业时间"); header.put("avgPassRate", "及格率"); header.put("avgScore", "平均得分"); header.put("teacherOpenCourseQuestionSettingPushStatusText", "状态"); @@ -137,11 +140,10 @@ public class TeacherOpenCourseQuestionSettingController { case HOMEWORK_FILE: header.put("teacherOpenCourseQuestionSettingName", "题库作业名称"); header.put("teacherOpenCourseQuestionSettingSchoolClassNames", "作业班级"); - header.put("messageAddTime", "作业附件"); + //header.put("messageAddTime", "作业附件"); header.put("avgScore", "平均得分"); header.put("avgPassRate", "及格率"); - header.put("teacherOpenCourseQuestionStartTime", "作业开始时间"); - header.put("teacherOpenCourseQuestionEndTime", "作业结束时间"); + header.put("teacherOpenCourseQuestionStartAndEndTime", "作业时间"); header.put("teacherOpenCourseQuestionSettingPushStatusText", "状态"); baseName = "附件作业-导出"; break; @@ -150,7 +152,9 @@ public class TeacherOpenCourseQuestionSettingController { throw new PlatformException("参数错误"); } - List> maps = BeanCopyUtil.baseEntity2MapWithParallel(page.getList()); + List> maps = BeanCopyUtil.baseEntity2MapWithParallel(list); + + String filename = StrUtil.format("{} {}.xlsx", baseName, System.currentTimeMillis()); write(response, filename, "Sheet1", header.values(), convertData(header.keySet(), maps)); diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md b/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md index 79982189..0a69c359 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md @@ -679,4 +679,93 @@ getQuestionSettingScoreInfo and t.question_log_add_type = 'FINALLY_SUBMIT' and t.teacher_open_course_question_setting_id = #questionSettingId# and t.student_id = #studentId# - \ No newline at end of file + +queryByConditionQueryNotPage +=== +* 根据不为空的条件进行查询 + select + t.* + from teacher_open_course_question_setting t + where 1=1 + @//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行 + and #function("teacherOpenCourseQuestionSetting.query")# + @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#) + @} + ORDER BY + CONVERT(regexp_replace ( t.teacher_open_course_question_setting_name, '[^0-9]+', '' ),unsigned) asc