|
@@ -137,14 +137,14 @@ public class ExamStudentService {
|
|
Long orgId = examStudent.getOrgId();
|
|
Long orgId = examStudent.getOrgId();
|
|
ExamOrgTime examOrgTime = examOrgTimeRepo.findFirstByExamIdAndOrgId(examId,orgId);
|
|
ExamOrgTime examOrgTime = examOrgTimeRepo.findFirstByExamIdAndOrgId(examId,orgId);
|
|
if(examOrgTime != null){
|
|
if(examOrgTime != null){
|
|
- String examBeginTime = DateFormat.dateFormat(examOrgTime.getBeginTime());
|
|
|
|
- String examEndTime = DateFormat.dateFormat(examOrgTime.getEndTime());
|
|
|
|
|
|
+ String examBeginTime = String.valueOf(examOrgTime.getBeginTime().getTime());
|
|
|
|
+ String examEndTime = String.valueOf(examOrgTime.getEndTime().getTime());
|
|
examStudent.setExamBeginTime(examBeginTime);
|
|
examStudent.setExamBeginTime(examBeginTime);
|
|
examStudent.setExamEndTime(examEndTime);
|
|
examStudent.setExamEndTime(examEndTime);
|
|
}
|
|
}
|
|
}else{
|
|
}else{
|
|
- String examBeginTime = DateFormat.dateFormat(exam.getBeginTime());
|
|
|
|
- String examEndTime = DateFormat.dateFormat(exam.getEndTime());
|
|
|
|
|
|
+ String examBeginTime = String.valueOf(exam.getBeginTime().getTime());
|
|
|
|
+ String examEndTime = String.valueOf(exam.getEndTime().getTime());
|
|
examStudent.setExamBeginTime(examBeginTime);
|
|
examStudent.setExamBeginTime(examBeginTime);
|
|
examStudent.setExamEndTime(examEndTime);
|
|
examStudent.setExamEndTime(examEndTime);
|
|
}
|
|
}
|