...

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/service/examwork/api/ExamApi.java

@@ -39,12 +39,13 @@ import cn.com.qmth.examcloud.service.examwork.dao.ExamRepo;
 import cn.com.qmth.examcloud.service.examwork.api.bean.CourseGroupBean;
 import cn.com.qmth.examcloud.service.examwork.dao.CourseGroupRelationRepo;
 import cn.com.qmth.examcloud.service.examwork.dao.CourseGroupRepo;
-import cn.com.qmth.examcloud.service.examwork.dao.ExamSetting4OrgRepo;
+import cn.com.qmth.examcloud.service.examwork.dao.ExamOrgRepo;
 import cn.com.qmth.examcloud.service.examwork.dao.ExamStudentRepo;
 import cn.com.qmth.examcloud.service.examwork.entity.Exam;
 import cn.com.qmth.examcloud.service.examwork.entity.CourseGroup;
 import cn.com.qmth.examcloud.service.examwork.entity.CourseGroupRelation;
-import cn.com.qmth.examcloud.service.examwork.entity.ExamSetting4Org;
+import cn.com.qmth.examcloud.service.examwork.entity.ExamOrg;
+import cn.com.qmth.examcloud.service.examwork.entity.ExamOrgPK;
 import cn.com.qmth.examcloud.service.examwork.entity.ExamStudent;
 import cn.com.qmth.examcloud.service.examwork.enums.ExamType;
 import cn.com.qmth.examcloud.service.examwork.service.ExamService;
@@ -74,7 +75,7 @@ public class ExamApi extends ControllerSupport {
 	CourseGroupRepo courseGroupRepo;
 
 	@Autowired
-	ExamSetting4OrgRepo examSetting4OrgRepo;
+	ExamOrgRepo examOrgRepo;
 	
 	@Autowired
 	CourseGroupRelationRepo courseGroupRelationRepo;
@@ -387,34 +388,43 @@ public class ExamApi extends ControllerSupport {
 		courseGroupRelationRepo.save(relationList);
 	}
 
-	@ApiOperation(value = "删除课程组", notes = "删除特殊考试设置")
+	@ApiOperation(value = "删除课程组", notes = "")
 	@DeleteMapping("/exam/courseGroup/{id}")
 	public void deleteSpecificExam(@PathVariable Long id, HttpServletRequest request) {
 		courseGroupRepo.delete(id);
 		courseGroupRelationRepo.deleteByGroupId(id);
 	}
 
-	@ApiOperation(value = "查询考试相关的学习中心设置", notes = "查询考试相关的学习中心设置")
-	@GetMapping("/exam/examSetting4OrgList/{examId}/{curPage}/{pageSize}")
-	public List<?> getExamSetting4OrgList(@PathVariable Long examId, @PathVariable Integer curPage,
+	@ApiOperation(value = "查询考试相关的学习中心设置", notes = "")
+	@GetMapping("/exam/getExamOrgList/{examId}/{curPage}/{pageSize}")
+	public List<?> getExamOrgList(@PathVariable Long examId, @PathVariable Integer curPage,
 			@PathVariable Integer pageSize) {
 		Pageable pageable = new PageRequest(curPage, pageSize, Sort.Direction.DESC, "updateTime");
-		List<ExamSetting4Org> allByExamId = examSetting4OrgRepo.findAllByExamId(examId, pageable);
+		List<ExamOrg> allByExamId = examOrgRepo.findAllByExamId(examId, pageable);
 		return allByExamId;
 	}
 
-	@ApiOperation(value = "新增考试相关的学习中心设置", notes = "新增考试相关的学习中心设置")
-	@PostMapping("/exam/examSetting4Org")
-	public ExamSetting4Org addExamSetting4Org(@RequestBody ExamSetting4Org examSetting4Org) {
-		ExamSetting4Org ret = examSetting4OrgRepo.save(examSetting4Org);
+	@ApiOperation(value = "新增考试相关的学习中心设置", notes = "")
+	@PostMapping("/exam/examOrg")
+	public ExamOrg addExamOrg(@RequestBody ExamOrg examOrg) {
+		ExamOrg ret = examOrgRepo.save(examOrg);
 		return ret;
 	}
 
-	@ApiOperation(value = "更新考试相关的学习中心设置", notes = "更新考试相关的学习中心设置")
-	@PutMapping("/exam/examSetting4Org")
-	public ExamSetting4Org updateExamSetting4Org(@RequestBody ExamSetting4Org examSetting4Org) {
-		ExamSetting4Org ret = examSetting4OrgRepo.save(examSetting4Org);
+	@ApiOperation(value = "更新考试相关的学习中心设置", notes = "")
+	@PutMapping("/exam/examOrg")
+	public ExamOrg updateExamOrg(@RequestBody ExamOrg examOrg) {
+		ExamOrg ret = examOrgRepo.save(examOrg);
 		return ret;
 	}
+	
+	@ApiOperation(value = "删除考试相关的学习中心设置", notes = "")
+	@DeleteMapping("/exam/examOrg/{examId}/{orgId}")
+	public void deleteExamOrg(@PathVariable Long examId, @PathVariable Long orgId) {
+		ExamOrg examOrg = new ExamOrg();
+		examOrg.setExamId(examId);
+		examOrg.setOrgId(orgId);
+		examOrgRepo.delete(examOrg);
+	}
 
 }

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

@@ -0,0 +1,20 @@
+package cn.com.qmth.examcloud.service.examwork.dao;
+
+import java.util.List;
+
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.repository.query.QueryByExampleExecutor;
+
+import cn.com.qmth.examcloud.service.examwork.entity.ExamOrg;
+
+public interface ExamOrgRepo
+		extends
+			JpaRepository<ExamOrg, Long>,
+			QueryByExampleExecutor<ExamOrg> {
+
+	List<ExamOrg> findAllByExamId(Long examId, Pageable pageable);
+
+	List<ExamOrg> findAllByExamIdAndOrgId(Long examId, Long orgId, Pageable pageable);
+
+}

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

@@ -1,20 +0,0 @@
-package cn.com.qmth.examcloud.service.examwork.dao;
-
-import java.util.List;
-
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.repository.query.QueryByExampleExecutor;
-
-import cn.com.qmth.examcloud.service.examwork.entity.ExamSetting4Org;
-
-public interface ExamSetting4OrgRepo
-		extends
-			JpaRepository<ExamSetting4Org, Long>,
-			QueryByExampleExecutor<ExamSetting4Org> {
-
-	List<ExamSetting4Org> findAllByExamId(Long examId, Pageable pageable);
-
-	List<ExamSetting4Org> findAllByExamIdAndOrgId(Long examId, Long orgId, Pageable pageable);
-
-}

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/entity/ExamSetting4Org.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/entity/ExamOrg.java

@@ -20,8 +20,8 @@ import cn.com.qmth.examcloud.commons.web.jpa.JpaEntity;
  */
 @Entity
 @Table(name = "ecs_e_exam_4_org")
-@IdClass(ExamSetting4OrgPK.class)
-public class ExamSetting4Org extends JpaEntity {
+@IdClass(ExamOrgPK.class)
+public class ExamOrg extends JpaEntity {
 
 	private static final long serialVersionUID = -3335725218626631530L;
 
@@ -29,7 +29,7 @@ public class ExamSetting4Org extends JpaEntity {
 	private Long examId;
 
 	@Id
-	private String orgId;
+	private Long orgId;
 
 	/**
 	 * 考试批次开始时间
@@ -51,11 +51,11 @@ public class ExamSetting4Org extends JpaEntity {
 		this.examId = examId;
 	}
 
-	public String getOrgId() {
+	public Long getOrgId() {
 		return orgId;
 	}
 
-	public void setOrgId(String orgId) {
+	public void setOrgId(Long orgId) {
 		this.orgId = orgId;
 	}
 

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/entity/ExamSetting4OrgPK.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/entity/ExamOrgPK.java

@@ -8,13 +8,23 @@ import java.io.Serializable;
  * @author WANG
  *
  */
-public class ExamSetting4OrgPK implements Serializable {
+public class ExamOrgPK implements Serializable {
 
 	private static final long serialVersionUID = 3692854300698527252L;
 
 	private Long examId;
 
-	private String orgId;
+	private Long orgId;
+
+	public ExamOrgPK() {
+		super();
+	}
+
+	public ExamOrgPK(Long examId, Long orgId) {
+		super();
+		this.examId = examId;
+		this.orgId = orgId;
+	}
 
 	public Long getExamId() {
 		return examId;
@@ -24,11 +34,11 @@ public class ExamSetting4OrgPK implements Serializable {
 		this.examId = examId;
 	}
 
-	public String getOrgId() {
+	public Long getOrgId() {
 		return orgId;
 	}
 
-	public void setOrgId(String orgId) {
+	public void setOrgId(Long orgId) {
 		this.orgId = orgId;
 	}