xiatian 6 gadi atpakaļ
vecāks
revīzija
5b2ef69042

+ 0 - 7
examcloud-core-reports-dao/src/main/java/cn/com/qmth/examcloud/core/reports/dao/entity/ExamCourseDataReportEntity.java

@@ -47,25 +47,18 @@ public class ExamCourseDataReportEntity extends IdEntity {
     @NotNull
     private String courseCode;
     //满分
-    @NotNull
     private Double totalScore;
     //最高分
-    @NotNull
     private Double maxScore;
     //最低分
-    @NotNull
     private Double minScore;
     //平均分
-    @NotNull
     private Double avgScore;
     //标准差
-    @NotNull
     private Double std;
     //平均调卷难度
-    @NotNull
     private Double avgDifficultyDegree;
     //差异系数
-    @NotNull
     private Double cdi;
     //报名人数
     @NotNull

+ 3 - 3
examcloud-core-reports-dao/src/main/java/cn/com/qmth/examcloud/core/reports/dao/entity/share/IdEntity.java

@@ -1,14 +1,14 @@
 package cn.com.qmth.examcloud.core.reports.dao.entity.share;
 
-import java.io.Serializable;
-
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;
 
+import cn.com.qmth.examcloud.web.jpa.JpaEntity;
+
 @MappedSuperclass
-public abstract class IdEntity implements Serializable{
+public abstract class IdEntity extends JpaEntity{
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

+ 5 - 1
examcloud-core-reports-service/src/main/java/cn/com/qmth/examcloud/core/reports/service/impl/ExamCourseDataReportServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -46,16 +47,19 @@ public class ExamCourseDataReportServiceImpl implements ExamCourseDataReportServ
 	@Transactional
 	@Override
 	public void saveExamCourseDataReportList(List<ExamCourseDataReportBean> beans) {
+		Date now=new Date();
 		List<ExamCourseDataReportEntity> list = new ArrayList<ExamCourseDataReportEntity>();
 		for (ExamCourseDataReportBean bean : beans) {
 			ExamCourseDataReportEntity e = new ExamCourseDataReportEntity();
 			BeanUtils.copyProperties(bean, e);
+			e.setCreationTime(now);
+			e.setUpdateTime(now);
 			e.setPartitionData(StringUtils.join(bean.getPartitionData().toArray(), ","));
 			list.add(e);
 		}
 		examCourseDataReportRepo.saveAll(list);
 	}
-
+	@Transactional
 	@Override
 	public void deleteByProject(Long projectId, Long rootOrgId) {
 		examCourseDataReportRepo.deleteByProject(projectId, rootOrgId);

+ 5 - 1
examcloud-core-reports-service/src/main/java/cn/com/qmth/examcloud/core/reports/service/impl/ExamOrgReportServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -45,16 +46,19 @@ public class ExamOrgReportServiceImpl implements ExamOrgReportService {
 	@Transactional
 	@Override
 	public void saveExamOrgReportList(List<ExamOrgReportBean> beans) {
+		Date now=new Date();
 		List<ExamOrgReportEntity> list = new ArrayList<ExamOrgReportEntity>();
 		for (ExamOrgReportBean bean : beans) {
 			ExamOrgReportEntity e = new ExamOrgReportEntity();
 			BeanUtils.copyProperties(bean, e);
+			e.setCreationTime(now);
+			e.setUpdateTime(now);
 			e.setPartitionData(StringUtils.join(bean.getPartitionData().toArray(), ","));
 			list.add(e);
 		}
 		examOrgReportRepo.saveAll(list);
 	}
-
+	@Transactional
 	@Override
 	public void deleteByProject(Long projectId, Long rootOrgId) {
 		examOrgReportRepo.deleteByProject(projectId, rootOrgId);

+ 1 - 0
examcloud-core-reports-service/src/main/java/cn/com/qmth/examcloud/core/reports/service/impl/ProjectServiceImpl.java

@@ -280,6 +280,7 @@ public class ProjectServiceImpl implements ProjectService {
 		return pe;
 	}
 
+	@Transactional
 	@Override
 	public void updateProjectCourseOrgCount(UpdateProjectCourseOrgCountReq req) {
 		projectRepo.updateProjectCourseOrgCount(req.getProjectId(), req.getCourseCount(), req.getOrgCount());