Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

edu-cms/src/main/java/com/keao/edu/cms/service/impl/SysNewsInformationServiceImpl.java

@@ -5,11 +5,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.keao.edu.cms.controller.queryinfo.NewsInformationQueryInfo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import com.keao.edu.cms.controller.queryinfo.NewsInformationQueryInfo;
 import com.keao.edu.cms.dal.dao.SysNewsInformationDao;
 import com.keao.edu.cms.dal.entity.NewsStatusEnum;
 import com.keao.edu.cms.dal.entity.SysNewsInformation;
@@ -26,13 +25,6 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 	@Autowired
 	private SysNewsInformationDao sysNewsInformationDao;
 	
-	@Value("${user.server.context.path}")
-	private String serverContextPath;
-	
-	public void setServerContextPath(String serverContextPath) {
-		this.serverContextPath = serverContextPath;
-	}
-
 	@Override
 	public BaseDAO<Long, SysNewsInformation> getDAO() {
 		return sysNewsInformationDao;

edu-user/edu-user-server/src/main/java/com/keao/edu/user/enums/ExamEvaluationResultEnum.java

@@ -8,7 +8,7 @@ import com.keao.edu.common.enums.BaseEnum;
  **/
 public enum ExamEvaluationResultEnum implements BaseEnum<String, ExamEvaluationResultEnum> {
 
-    EXCELLENT("excellent", "优秀"),
+    EXCELLENT("EXCELLENT", "优秀"),
     WELL("WELL", "良好"),
     PASS("PASS", "及格"),
     FAIL("FAIL", "不及格");

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamOrganizationRelationServiceImpl.java

@@ -62,7 +62,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 	@Autowired
 	private SysConfigService sysConfigService;
 
-	public static final Set<ExamStatusEnum> EDIT_ABLE_EXAM_STATUS=new HashSet<>(Arrays.asList(ExamStatusEnum.SETTING,ExamStatusEnum.NOT_START,ExamStatusEnum.APPLYING));
+	public static final Set<ExamStatusEnum> EDIT_ABLE_EXAM_STATUS=new HashSet<>(Arrays.asList(ExamStatusEnum.SETTING,ExamStatusEnum.NOT_START,ExamStatusEnum.APPLYING,ExamStatusEnum.APPLIED));
 
 	@Override
 	public BaseDAO<Long, ExamOrganizationRelation> getDAO() {
@@ -174,6 +174,9 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 		if(Objects.isNull(examinationBasic)){
 			throw new BizException("考级项目不存在");
 		}
+		if(!ExamStatusEnum.CLOSE.equals(examinationBasic.getStatus())){
+			throw new BizException("考级项目已关闭");
+		}
 
 		SysConfig baseUrlConfig = sysConfigService.findByParamName(SysConfigService.BASE_API_URL);
 		String baseUrl="";

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRoomServiceImpl.java

@@ -11,10 +11,10 @@ import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
 import com.keao.edu.common.tenant.TenantContextHolder;
 import com.keao.edu.user.api.entity.ExamRoom;
+import com.keao.edu.user.api.enums.ExamModeEnum;
 import com.keao.edu.user.dao.*;
 import com.keao.edu.user.dto.ExamRoomDto;
 import com.keao.edu.user.dto.ExamRoomStatisticsDto;
-import com.keao.edu.user.api.enums.ExamModeEnum;
 import com.keao.edu.user.entity.ExamRegistration;
 import com.keao.edu.user.entity.ExaminationBasic;
 import com.keao.edu.user.page.ExamRoomQueryInfo;

edu-user/edu-user-server/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -19,7 +19,7 @@
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="tenant_id_" property="tenantId" />
-		<association property="sysUser" columnPrefix="sys_user_" resultMap="com.keao.edu.user.dao.SysUserDao.SysUser"/>
+		<association property="sysUser" resultMap="com.keao.edu.user.dao.SysUserDao.SysUser"/>
 	</resultMap>
 
 	<resultMap id="TeacherDto" type="com.keao.edu.user.dto.TeacherDto" extends="Teacher">