..

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamController.java

@@ -53,7 +53,7 @@ import cn.com.qmth.examcloud.core.examwork.dao.ExamPropertyRepo;
 import cn.com.qmth.examcloud.core.examwork.dao.ExamRepo;
 import cn.com.qmth.examcloud.core.examwork.dao.ExamStudentRepo;
 import cn.com.qmth.examcloud.core.examwork.dao.entity.CourseGroupEntity;
-import cn.com.qmth.examcloud.core.examwork.dao.entity.CourseGroupRelation;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.CourseGroupRelationEntity;
 import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamEntity;
 import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamOrgEntity;
 import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamPropertyEntity;
@@ -436,10 +436,10 @@ public class ExamController extends ControllerSupport {
 			List<Long> courseIdList = Lists.newArrayList();
 			bean.setCourseIdList(courseIdList);
 
-			List<CourseGroupRelation> relationList = courseGroupRelationRepo
+			List<CourseGroupRelationEntity> relationList = courseGroupRelationRepo
 					.findAllByGroupId(bean.getId());
 
-			for (CourseGroupRelation cur : relationList) {
+			for (CourseGroupRelationEntity cur : relationList) {
 				courseIdList.add(cur.getCourseId());
 			}
 
@@ -454,11 +454,11 @@ public class ExamController extends ControllerSupport {
 	public List<CourseGroupBean> queryCourseGroupList(@PathVariable Long examId,
 			@PathVariable Long courseId) {
 
-		List<CourseGroupRelation> relationList = courseGroupRelationRepo
+		List<CourseGroupRelationEntity> relationList = courseGroupRelationRepo
 				.findAllByCourseIdAndExamId(courseId, examId);
 
 		List<Long> groupIdList = Lists.newArrayList();
-		for (CourseGroupRelation cur : relationList) {
+		for (CourseGroupRelationEntity cur : relationList) {
 			Long groupId = cur.getGroupId();
 			groupIdList.add(groupId);
 		}
@@ -482,10 +482,10 @@ public class ExamController extends ControllerSupport {
 			List<Long> courseIdList = Lists.newArrayList();
 			bean.setCourseIdList(courseIdList);
 
-			List<CourseGroupRelation> curRelationList = courseGroupRelationRepo
+			List<CourseGroupRelationEntity> curRelationList = courseGroupRelationRepo
 					.findAllByGroupId(bean.getId());
 
-			for (CourseGroupRelation cur : curRelationList) {
+			for (CourseGroupRelationEntity cur : curRelationList) {
 				courseIdList.add(cur.getCourseId());
 			}
 		}
@@ -511,12 +511,12 @@ public class ExamController extends ControllerSupport {
 		courseGroupRepo.save(courseGroup);
 		List<Long> courseIdList = courseGroupBean.getCourseIdList();
 
-		List<CourseGroupRelation> relationList = Lists.newArrayList();
+		List<CourseGroupRelationEntity> relationList = Lists.newArrayList();
 
 		courseGroupRelationRepo.deleteByGroupId(courseGroup.getId());
 
 		for (Long cur : courseIdList) {
-			CourseGroupRelation relation = new CourseGroupRelation();
+			CourseGroupRelationEntity relation = new CourseGroupRelationEntity();
 			relation.setCourseId(cur);
 			relation.setExamId(courseGroupBean.getExamId());
 			relation.setGroupId(courseGroup.getId());

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/CourseGroupRelationRepo.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.core.examwork.dao.entity.CourseGroupRelation;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.CourseGroupRelationEntity;
 import cn.com.qmth.examcloud.core.examwork.dao.entity.CourseGroupRelationPK;
 
 /**
@@ -17,12 +17,12 @@ import cn.com.qmth.examcloud.core.examwork.dao.entity.CourseGroupRelationPK;
  */
 public interface CourseGroupRelationRepo
 		extends
-			JpaRepository<CourseGroupRelation, CourseGroupRelationPK>,
-			QueryByExampleExecutor<CourseGroupRelation> {
+			JpaRepository<CourseGroupRelationEntity, CourseGroupRelationPK>,
+			QueryByExampleExecutor<CourseGroupRelationEntity> {
 
-	List<CourseGroupRelation> findAllByGroupId(Long groupId);
+	List<CourseGroupRelationEntity> findAllByGroupId(Long groupId);
 
-	List<CourseGroupRelation> findAllByCourseIdAndExamId(Long courseId, Long examId);
+	List<CourseGroupRelationEntity> findAllByCourseIdAndExamId(Long courseId, Long examId);
 
 	void deleteByGroupId(Long groupId);
 

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/entity/CourseGroupRelation.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/entity/CourseGroupRelationEntity.java

@@ -16,7 +16,7 @@ import cn.com.qmth.examcloud.commons.web.jpa.JpaEntity;
 @Entity
 @Table(name = "ecs_e_course_group_relation")
 @IdClass(CourseGroupRelationPK.class)
-public class CourseGroupRelation extends JpaEntity {
+public class CourseGroupRelationEntity extends JpaEntity {
 
 	private static final long serialVersionUID = -3335725218626631530L;