zouxuan 5 years ago
parent
commit
d95cbf39b4

+ 2 - 0
edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRoomStudentRelationServiceImpl.java

@@ -26,6 +26,7 @@ import com.keao.edu.user.page.ExamRoomStudentRelationQueryInfo;
 import com.keao.edu.user.service.*;
 import com.keao.edu.util.collection.MapUtil;
 import com.keao.edu.util.date.DateUtil;
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -357,6 +358,7 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 		stuRecordDetailDto.setSubTime(secondsBetween);
 		stuRecordDetailDto.setRecordTime(recordMinutes);
 		stuRecordDetailDto.setExamRegistrationId(examRegistrationId);
+		stuRecordDetailDto.setSongJson(StringEscapeUtils.unescapeJavaScript(stuRecordDetailDto.getSongJson()));
 		stuRecordDetailDto.setSingleSongRecordMinutes(Integer.parseInt(sysConfigService.findByParamName("single_song_record_minutes").getParanValue()));
 		return stuRecordDetailDto;
 	}

+ 1 - 1
edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRoomMapper.xml

@@ -331,7 +331,7 @@
 		FROM exam_room er
 		LEFT JOIN examination_basic eb ON er.examination_basic_id_ = eb.id_
 		<include refid="queryExamRoomPageListSql"/>
-		ORDER BY eb.exam_start_time_ DESC
+		ORDER BY er.exam_start_time_ DESC
 		<include refid="global.limit"/>
 	</select>