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 4d39b51529
commit 0fa378166e
7 changed files with 204 additions and 2 deletions
Show Stats Download Patch File Download Diff File

15
web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionLogDao.java
Unescape Escape View File

@ -2,6 +2,8 @@ package com.ibeetl.jlw.dao;
import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLog;
import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLogScoreDetailsInfo;
import com.ibeetl.jlw.entity.dto.TeacherOpenCourseHomeWorkLogDTO;
import com.ibeetl.jlw.entity.vo.TeacherOpenCourseHomeWorkLogExportVO;
import com.ibeetl.jlw.enums.QuestionLogAddTypeEnum;
import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
import com.ibeetl.jlw.web.query.TeacherOpenCourseQuestionLogQuery;
@ -160,4 +162,17 @@ public interface TeacherOpenCourseQuestionLogDao extends BaseMapper<TeacherOpenC
*/
long getNotSubmitQuestionLogsCount(Long studentId, Long questionSettingId);
/**
* 查询附件作业-日志
* @param dto
* @return
*/
List<TeacherOpenCourseHomeWorkLogExportVO> getHomeWorkLogExportList(TeacherOpenCourseHomeWorkLogDTO dto);
/**
* 查询附件作业-日志（分页）
* @param pageQuery
* @return
*/
PageQuery<TeacherOpenCourseHomeWorkLogExportVO> getHomeWorkLogExportPageList(PageQuery pageQuery);
}

17
web/src/main/java/com/ibeetl/jlw/entity/dto/TeacherOpenCourseHomeWorkLogDTO.java
Unescape Escape View File

@ -0,0 +1,17 @@
package com.ibeetl.jlw.entity.dto;
import com.ibeetl.admin.core.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/*
* 我的课程-题库-做题日志 附件作业 导出
* gen by Spring Boot2 Admin 2022-10-05
*/
@Data
@EqualsAndHashCode(callSuper=false)
public class TeacherOpenCourseHomeWorkLogDTO extends BaseEntity {
private String questionSettingIdPlural;
}

17
web/src/main/java/com/ibeetl/jlw/entity/dto/TeacherOpenCourseHomeWorkLogPageDTO.java
Unescape Escape View File

@ -0,0 +1,17 @@
package com.ibeetl.jlw.entity.dto;
import com.ibeetl.admin.core.web.query.PageParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
/*
* 我的课程-题库-做题日志 附件作业 分页参数
* gen by Spring Boot2 Admin 2022-10-05
*/
@Data
@EqualsAndHashCode(callSuper=false)
public class TeacherOpenCourseHomeWorkLogPageDTO extends PageParam {
private String questionSettingIdPlural;
}

43
web/src/main/java/com/ibeetl/jlw/entity/vo/TeacherOpenCourseHomeWorkLogExportVO.java
Unescape Escape View File

@ -0,0 +1,43 @@
package com.ibeetl.jlw.entity.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.ibeetl.admin.core.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.FieldNameConstants;
/*
* 我的课程-题库-做题日志 附件作业 导出
* gen by Spring Boot2 Admin 2022-10-05
*/
@Data
@EqualsAndHashCode(callSuper=false)
@FieldNameConstants
@ExcelIgnoreUnannotated
public class TeacherOpenCourseHomeWorkLogExportVO extends BaseEntity {
/**
* 题目配置ID
*/
private String questionSettingId;
@ExcelProperty("学号")
private String studentSn;
@ExcelProperty("姓名")
private String studentName;
@ExcelProperty("报告名称")
private String questionSettingName;
// @ExcelProperty("报告下载")
private String questionSettingFile;
@ExcelProperty("教师评语")
private String questionLogReply;
@ExcelProperty("报告得分")
private String studentScore;
}

20
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
Unescape Escape View File

@ -21,6 +21,8 @@ import com.ibeetl.jlw.dao.TeacherOpenCourseQuestionLogDao;
import com.ibeetl.jlw.dao.TeacherOpenCourseQuestionSettingDao;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.entity.dto.QuestionLogAddDTO;
import com.ibeetl.jlw.entity.dto.TeacherOpenCourseHomeWorkLogDTO;
import com.ibeetl.jlw.entity.vo.TeacherOpenCourseHomeWorkLogExportVO;
import com.ibeetl.jlw.entity.vo.TeacherOpenCourseQuestionLogAnswerLockVO;
import com.ibeetl.jlw.enums.QuestionLogAddTypeEnum;
import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
@ -1071,4 +1073,22 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
// 只取部分属性给到前端
return BeanUtil.copyToList(list, TeacherOpenCourseQuestionLogAnswerLockVO.class);
}
/**
* 查询附件作业-日志
* @param dto
* @return
*/
public List<TeacherOpenCourseHomeWorkLogExportVO> getHomeWorkLogExportList(TeacherOpenCourseHomeWorkLogDTO dto) {
return teacherOpenCourseQuestionLogDao.getHomeWorkLogExportList(dto);
}
/**
* 查询附件作业-日志（分页）
* @param pageQuery
* @return
*/
public PageQuery<TeacherOpenCourseHomeWorkLogExportVO> getHomeWorkLogExportPageList(PageQuery pageQuery) {
return teacherOpenCourseQuestionLogDao.getHomeWorkLogExportPageList(pageQuery);
}
}

37
web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java
Unescape Escape View File

@ -17,6 +17,9 @@ import com.ibeetl.jlw.entity.ResourcesQuestionSnapshot;
import com.ibeetl.jlw.entity.Student;
import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLog;
import com.ibeetl.jlw.entity.dto.QuestionLogAddDTO;
import com.ibeetl.jlw.entity.dto.TeacherOpenCourseHomeWorkLogDTO;
import com.ibeetl.jlw.entity.dto.TeacherOpenCourseHomeWorkLogPageDTO;
import com.ibeetl.jlw.entity.vo.TeacherOpenCourseHomeWorkLogExportVO;
import com.ibeetl.jlw.service.TeacherOpenCourseQuestionLogService;
import com.ibeetl.jlw.web.query.TeacherOpenCourseQuestionLogQuery;
import com.ibeetl.jlw.web.query.TeacherOpenCourseQuestionLogScoreDetailsInfoQuery;
@ -50,7 +53,7 @@ import static com.ibeetl.jlw.enums.QuestionLogAddTypeEnum.FINALLY_SUBMIT;
*/
@RestController
public class TeacherOpenCourseQuestionLogController {
public class TeacherOpenCourseQuestionLogController extends BaseController {
private final Log log = LogFactory.getLog(this.getClass());
private static final String MODEL = "/jlw/teacherOpenCourseQuestionLog";
@ -517,4 +520,36 @@ public class TeacherOpenCourseQuestionLogController {
teacherOpenCourseQuestionLogService.deleteTeacherOpenCourseQuestionLog(ids);
return JsonResult.success();
}
/**
* 附件作业日志导出
* @param query 附件的题目配置IDs （非必传）
* @return
*/
@SneakyThrows
@PostMapping(MODEL + "/homeworkFileLogExport.json")
@ResponseBody
public String homeworkFileLogExport(TeacherOpenCourseHomeWorkLogDTO query, @SCoreUser CoreUser coreUser) {
List<TeacherOpenCourseHomeWorkLogExportVO> list = teacherOpenCourseQuestionLogService.getHomeWorkLogExportList(query);
String filename = StrUtil.format("附件作业日志导出{}.xlsx", DateUtil.now());
write(response, filename, "Sheet1", TeacherOpenCourseHomeWorkLogExportVO.class, list);
return null;
}
/**
* 附件作业日志导出
* @param dto 附件的题目配置IDs （非必传）
* @return
*/
@SneakyThrows
@PostMapping(MODEL + "/homeworkFileLogPageList.json")
@ResponseBody
public JsonResult homeworkFileLogPageList(TeacherOpenCourseHomeWorkLogPageDTO dto, @SCoreUser CoreUser coreUser) {
return JsonResult.success(teacherOpenCourseQuestionLogService.getHomeWorkLogExportPageList(dto.getPageQuery()));
}
}

55
web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md
Unescape Escape View File

@ -981,3 +981,58 @@ getNotSubmitQuestionLogsCount
)
AND t.student_id = #studentId#
AND t.teacher_open_course_question_setting_id = #questionSettingId#
getHomeWorkLogExportPageList
===
* 查询附件作业-日志(分页)
SELECT
@pageTag() {
ta.student_sn,
ta.student_name,
tb.teacher_open_course_question_setting_id AS question_setting_id,
tb.teacher_open_course_question_setting_name AS question_setting_name,
t.teacher_open_course_question_log_upload_file AS question_setting_file,
t.teacher_open_course_question_log_reply AS question_log_reply,
t.student_score
@}
FROM
teacher_open_course_question_log t
INNER JOIN teacher_open_course_question_setting tb ON tb.teacher_open_course_question_setting_id = t.teacher_open_course_question_setting_id
AND tb.teacher_open_course_question_setting_status = 1
INNER JOIN student ta ON ta.student_id = t.student_id
AND ta.student_status = 1
WHERE
1
AND t.teacher_open_course_question_log_status = 1
AND t.student_score is not null
@if(isNotEmpty(questionSettingIdPlural)) {
and find_in_set(t.teacher_open_course_question_setting_id, #questionSettingIdPlural#)
@}
getHomeWorkLogExportList
===
* 查询附件作业-日志
SELECT
ta.student_sn,
ta.student_name,
tb.teacher_open_course_question_setting_id AS question_setting_id,
tb.teacher_open_course_question_setting_name AS question_setting_name,
t.teacher_open_course_question_log_upload_file AS question_setting_file,
t.teacher_open_course_question_log_reply AS question_log_reply,
t.student_score
FROM
teacher_open_course_question_log t
INNER JOIN teacher_open_course_question_setting tb ON tb.teacher_open_course_question_setting_id = t.teacher_open_course_question_setting_id
AND tb.teacher_open_course_question_setting_status = 1
INNER JOIN student ta ON ta.student_id = t.student_id
AND ta.student_status = 1
WHERE
1
AND t.teacher_open_course_question_log_status = 1
AND t.student_score is not null
@if(isNotEmpty(questionSettingIdPlural)) {
and find_in_set(t.teacher_open_course_question_setting_id, #questionSettingIdPlural#)
@}
Write Preview
Loading…
Cancel
Save