src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/mindskip/xzs/vo/QuestionExportVO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/QuestionMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java
@@ -197,9 +197,8 @@ .doWrite(data); } @GetMapping("/question/export") public void importQuestion(QuestionExportVO query, HttpServletResponse response) throws IOException { query.formartTime(); @PostMapping("/question/export") public void exportQuestion(@RequestBody QuestionExportVO query, HttpServletResponse response) throws IOException { // 查询导出数据 List<QuestionImportVO> exportData = questionService.export(query); // 构建数据 src/main/java/com/mindskip/xzs/vo/QuestionExportVO.java
@@ -6,6 +6,7 @@ import org.springframework.util.StringUtils; import java.util.Date; import java.util.List; /** * @author:xp @@ -15,29 +16,9 @@ public class QuestionExportVO { /** * 题型 * 课目 */ private Integer questionType; private List<Integer> subjectIds; /** * 开始时间 */ private String startStr; private Date start; /** * 结束时间 */ private String endStr; private Date end; public void formartTime() { if (StringUtils.hasText(startStr)) { start = DateTimeUtil.parse(startStr, "yyyy-MM-dd HH:mm:ss"); } if (StringUtils.hasText(endStr)) { end = DateTimeUtil.parse(endStr, "yyyy-MM-dd HH:mm:ss"); } } } src/main/resources/mapper/QuestionMapper.xml
@@ -249,16 +249,18 @@ <select id="export" resultMap="exportMap"> SELECT DISTINCT q.*, ttc.content FROM t_question q INNER JOIN t_text_content ttc on q.info_text_content_id = ttc.id AND q.deleted = 0 INNER JOIN t_question_subject tqs on q.id = tqs.question_id <where> <if test="query.questionType != null"> q.question_type = #{query.questionType} </if> <if test="query.start != null and query.end != null"> q.create_time between #{query.start} and #{query.end} <if test="query.subjectIds != null and query.subjectIds.size > 0"> AND tqs.subject_id IN <foreach collection="query.subjectIds" open="(" separator="," close=")" item="subjectId"> #{subjectId} </foreach> </if> </where> </select> @@ -297,7 +299,8 @@ </foreach> </select> <select id="selectQuestion" resultType="com.mindskip.xzs.viewmodel.student.question.answer.QuestionPageStudentResponseVM"> <select id="selectQuestion" resultType="com.mindskip.xzs.viewmodel.student.question.answer.QuestionPageStudentResponseVM"> select a.id, a.question_type, JSON_VALUE(d.content, '$.titleContent') as shortTitle, @@ -314,23 +317,19 @@ </select> <select id="selectContentById" resultType="com.mindskip.xzs.domain.vo.QuestionVO"> SELECT tq.id, SELECT tq.id, tq.question_type as questionType, tq.difficult, ttc.content as contentJson, tq.correct FROM t_question tq FROM t_question tq INNER JOIN t_text_content ttc ON tq.info_text_content_id = ttc.id AND tq.id = #{id} </select> <select id="getAnswer" resultType="com.mindskip.xzs.domain.vo.QuestionVO"> SELECT tq.correct, SELECT tq.correct, ttc.content as contentJson FROM t_question tq FROM t_question tq INNER JOIN t_text_content ttc ON tq.info_text_content_id = ttc.id AND tq.id = #{id} AND tq.deleted = 0 </select>