mingfu 1 месяц назад
Родитель
Сommit
0dc588f88e

+ 1 - 0
ie-admin/src/main/java/com/ruoyi/web/service/PaperService.java

@@ -325,6 +325,7 @@ public class PaperService {
             if(null != answerMap && null != (answer = answerMap.get(lqs.getId()))) {
                 qs.setAnswerId(answer.getAnswerId());
                 qs.setAnswers(Arrays.asList(answer.getAnswer().split(",")));
+                qs.setDuration(answer.getDuration());
                 qs.setState(answer.getState());
                 qs.setIsMark(answer.getMark());
                 qs.setIsNotKnow(answer.getNotKnow());

+ 6 - 5
ie-admin/src/main/java/com/ruoyi/web/service/StudentService.java

@@ -117,17 +117,18 @@ public class StudentService {
         list.forEach(t -> {
             DzSubject dzSubject = dzSubjectService.selectDzSubjectBySubjectId(t.getLong("subjectId"));
             t.put("subjectName", dzSubject.getSubjectName());
+            t.remove("beginTime");
+
             Date date = t.getDate("endTime");
-            if(null == date) {
-                date = t.getDate("beginTime");
-            }
             t.remove("endTime");
-            t.remove("beginTime");
-            t.put("date", DateUtils.format(date, "yyyy-MM-dd HH:mm"));
+            if(null != date) {
+                t.put("endTime", DateUtils.format(date, "yyyy-MM-dd HH:mm"));
+            }
 
             date = t.getDate("publishTime");
             t.remove("publishTime");
             t.put("publishTime", DateUtils.format(date, "yyyy-MM-dd HH:mm"));
+
             t.put("directed", StringUtils.isNotBlank(t.getString("directKey")));
             t.remove("directKey");
         });

+ 1 - 1
ie-system/src/main/resources/mapper/learn/LearnTestStudentMapper.xml

@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectExamineeTestList" resultType="com.alibaba.fastjson2.JSONObject">
-        SELECT ts.id, p.`paperName` `name`, ts.`subject_id` subjectId, ts.`create_time` beginTime, p.`fenshu` total, e.`end_time` endTime, IF(e.`state` IS NULL, 2, e.`state`) `state`, e.`score`
+        SELECT ts.id, p.`paperName` `name`, ts.`subject_id` subjectId, e.`begin_time` beginTime, e.`duration`, p.`fenshu` total, e.`end_time` endTime, IF(e.`state` IS NULL, 2, e.`state`) `state`, e.`score`
         , ts.create_time publishTime, u.`nick_name` publishUser,  p.`direct_key` directKey, us.`name` universityName, sr.`name` schoolName, sc.`name` campusName, mp.`majorName`, ts.`class_id` classId
         FROM `learn_test_student` ts
         JOIN `learn_paper` p ON ts.`paper_id` = p.`id`