Browse Source

。。。

wangwei 7 years ago
parent
commit
e79b04a8e8

+ 3 - 2
examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/provider/ExamStudentCloudServiceProvider.java

@@ -158,8 +158,9 @@ public class ExamStudentCloudServiceProvider extends ControllerSupport
 		examStudent.setInfoCollector(req.getInfoCollector());
 		examStudent.setName(studentInfo.getName());
 		examStudent.setRootOrgId(rootOrgId);
-		examStudent.setCourseCode(courseCode);
-		examStudent.setCourseName(courseName);
+		examStudent.setCourseId(courseBean.getId());
+		examStudent.setCourseCode(courseBean.getCode());
+		examStudent.setCourseName(courseBean.getName());
 		examStudent.setCourseLevel(courseBean.getLevel());
 		examStudent.setExam(exam);
 		examStudent.setIdentityNumber(studentInfo.getIdentityNumber());

+ 13 - 0
examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/entity/ExamStudent.java

@@ -64,6 +64,11 @@ public class ExamStudent extends JpaEntity {
 
 	private String examNumber;
 
+	/**
+	 * 课程ID
+	 */
+	private Long courseId;
+
 	/**
 	 * 课程code
 	 */
@@ -268,6 +273,14 @@ public class ExamStudent extends JpaEntity {
 		this.examNumber = examNumber;
 	}
 
+	public Long getCourseId() {
+		return courseId;
+	}
+
+	public void setCourseId(Long courseId) {
+		this.courseId = courseId;
+	}
+
 	public String getCourseCode() {
 		return courseCode;
 	}

+ 10 - 3
examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/impl/ExamStudentImportServiceImpl.java

@@ -1,6 +1,8 @@
 package cn.com.qmth.examcloud.core.examwork.service.impl;
 
 import java.io.File;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 import javax.persistence.CacheRetrieveMode;
@@ -123,10 +125,15 @@ public class ExamStudentImportServiceImpl implements ExamStudentImportService {
 	private void delete(Long batchId) {
 		EntityManager em = entityManagerFactory.createEntityManager();
 		EntityTransaction transaction = em.getTransaction();
-		Query query = em
-				.createQuery("delete from ExamStudentTempEntity s where s.batchId=:batchId");
+		Query query = em.createQuery(
+				"delete from ExamStudentTempEntity s where s.updateTime < :updateTime");
 		transaction.begin();
-		query.setParameter("batchId", batchId);
+		// 清理过去七天前的数据
+		Calendar c = Calendar.getInstance();
+		c.setTime(new Date());
+		c.add(Calendar.DATE, -7);
+		Date d = c.getTime();
+		query.setParameter("updateTime", d);
 		query.executeUpdate();
 		transaction.commit();
 	}