소스 검색

。。。。

WANG 6 년 전
부모
커밋
e61108c9e6

+ 1 - 1
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/CourseController.java

@@ -38,6 +38,7 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
+import cn.com.qmth.examcloud.api.commons.enums.CourseLevel;
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.commons.helpers.poi.ExcelWriter;
@@ -47,7 +48,6 @@ import cn.com.qmth.examcloud.core.basic.api.controller.bean.CourseDomain;
 import cn.com.qmth.examcloud.core.basic.dao.CourseRepo;
 import cn.com.qmth.examcloud.core.basic.dao.entity.CourseEntity;
 import cn.com.qmth.examcloud.core.basic.dao.entity.CourseSpeciatlyRelationEntity;
-import cn.com.qmth.examcloud.core.basic.dao.enums.CourseLevel;
 import cn.com.qmth.examcloud.core.basic.service.CourseService;
 import cn.com.qmth.examcloud.core.basic.service.bean.CourseInfo;
 import cn.com.qmth.examcloud.task.api.DataSyncCloudService;

+ 1 - 1
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/bean/CourseDomain.java

@@ -1,7 +1,7 @@
 package cn.com.qmth.examcloud.core.basic.api.controller.bean;
 
+import cn.com.qmth.examcloud.api.commons.enums.CourseLevel;
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
-import cn.com.qmth.examcloud.core.basic.dao.enums.CourseLevel;
 
 /**
  * 类注释

+ 1 - 1
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/CourseCloudServiceProvider.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import cn.com.qmth.examcloud.api.commons.enums.CourseLevel;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.basic.api.CourseCloudService;
 import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
@@ -19,7 +20,6 @@ import cn.com.qmth.examcloud.core.basic.dao.CourseRepo;
 import cn.com.qmth.examcloud.core.basic.dao.OrgRepo;
 import cn.com.qmth.examcloud.core.basic.dao.entity.CourseEntity;
 import cn.com.qmth.examcloud.core.basic.dao.entity.OrgEntity;
-import cn.com.qmth.examcloud.core.basic.dao.enums.CourseLevel;
 import cn.com.qmth.examcloud.core.basic.service.CourseService;
 import cn.com.qmth.examcloud.core.basic.service.bean.CourseInfo;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/CourseEntity.java

@@ -10,7 +10,7 @@ import javax.persistence.Id;
 import javax.persistence.Index;
 import javax.persistence.Table;
 
-import cn.com.qmth.examcloud.core.basic.dao.enums.CourseLevel;
+import cn.com.qmth.examcloud.api.commons.enums.CourseLevel;
 import cn.com.qmth.examcloud.web.jpa.JpaEntity;
 
 /**

+ 1 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/UserEntity.java

@@ -10,7 +10,7 @@ import javax.persistence.Id;
 import javax.persistence.Index;
 import javax.persistence.Table;
 
-import cn.com.qmth.examcloud.core.basic.dao.enums.Gender;
+import cn.com.qmth.examcloud.api.commons.enums.Gender;
 import cn.com.qmth.examcloud.web.jpa.JpaEntity;
 
 /**

+ 0 - 52
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/enums/CourseLevel.java

@@ -1,52 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.dao.enums;
-
-import cn.com.qmth.examcloud.commons.exception.ExamCloudRuntimeException;
-
-/**
- * 重新定义
- *
- * @author WANGWEI
- * @date 2018年7月10日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public enum CourseLevel {
-
-	ZSB("专升本"),
-
-	GQZ("高起专"),
-
-	GQB("高起本"),
-
-	ALL("不限");
-
-	private String name;
-
-	private CourseLevel(String name) {
-		this.name = name;
-	}
-
-	public String getName() {
-		return this.name;
-	}
-
-	/**
-	 * 混合查询
-	 *
-	 * @author WANGWEI
-	 * @param name
-	 * @return
-	 */
-	public static CourseLevel getCourseLevel(String name) {
-		for (CourseLevel cur : CourseLevel.values()) {
-			if (name.equals(cur.getName())) {
-				return cur;
-			}
-			if (name.equals(cur.name())) {
-				return cur;
-			}
-		}
-
-		throw new ExamCloudRuntimeException("level name is wong");
-	}
-
-}

+ 0 - 8
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/enums/Gender.java

@@ -1,8 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.dao.enums;
-
-/**
- * Created by songyue on 17/2/22.
- */
-public enum Gender {
-    MAN,WOMAN
-}

+ 1 - 1
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/bean/CourseInfo.java

@@ -1,7 +1,7 @@
 package cn.com.qmth.examcloud.core.basic.service.bean;
 
+import cn.com.qmth.examcloud.api.commons.enums.CourseLevel;
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
-import cn.com.qmth.examcloud.core.basic.dao.enums.CourseLevel;
 
 /**
  * 类注释

+ 1 - 1
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/CourseServiceImpl.java

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
+import cn.com.qmth.examcloud.api.commons.enums.CourseLevel;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.commons.helpers.poi.ExcelReader;
 import cn.com.qmth.examcloud.commons.util.PathUtil;
@@ -21,7 +22,6 @@ import cn.com.qmth.examcloud.core.basic.dao.CourseRepo;
 import cn.com.qmth.examcloud.core.basic.dao.OrgRepo;
 import cn.com.qmth.examcloud.core.basic.dao.entity.CourseEntity;
 import cn.com.qmth.examcloud.core.basic.dao.entity.OrgEntity;
-import cn.com.qmth.examcloud.core.basic.dao.enums.CourseLevel;
 import cn.com.qmth.examcloud.core.basic.service.CourseService;
 import cn.com.qmth.examcloud.core.basic.service.bean.CourseInfo;
 import cn.com.qmth.examcloud.task.api.DataSyncCloudService;