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

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/dao/SubjectDao.java

@@ -41,6 +41,15 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
      */
     List<Subject> findSubSubjects();
 
+    /**
+     * @describe 获取考级项目学员报考声部列表
+     * @author Joburgess
+     * @date 2020.08.17
+     * @param examId:
+     * @return java.util.List<com.keao.edu.user.entity.Subject>
+     */
+    List<Subject> findExamRegistSubjects(@Param("examId") Long examId);
+
     List<Subject> findBySubjectByIdList(@Param("subjectIdList") String subjectIdList);
 
     List<Subject> findBySubjectIds(@Param("subjectIds") List<Integer> subjectIds);

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/SubjectService.java

@@ -31,6 +31,15 @@ public interface SubjectService extends BaseService<Integer, Subject> {
      */
     List<Subject> findSubSubjects();
 
+    /**
+     * @describe 获取考级项目学员报考科目列表
+     * @author Joburgess
+     * @date 2020.08.17
+     * @param examId:
+     * @return java.util.List<com.keao.edu.user.entity.Subject>
+     */
+    List<Subject> findExamRegistSubjects(Long examId);
+
     List<Subject> findBySubjectByIdList(List<Integer> subjectIdList);
 
     List<Subject> findBySubjectByIdList(String subjectIdList);

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

@@ -297,6 +297,10 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 
 		List<ExamOrganizationRelation> examOrgans = examOrganizationRelationDao.getExamOrganizationRelations(examId.longValue(), null);
 
+		if(CollectionUtils.isEmpty(examOrgans)||examOrgans.size()<=1){
+			throw new BizException("请添加合作单位");
+		}
+
 		ExaminationBasic examinationBasic = examinationBasicDao.get(examId.longValue());
 		if(Objects.isNull(examinationBasic)){
 			throw new BizException("考级项目不存在");

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/StudentExamResultServiceImpl.java

@@ -205,6 +205,9 @@ public class StudentExamResultServiceImpl extends BaseServiceImpl<Long, StudentE
 			if(studentExamResult.getIsFinishedExam()==3){
 				continue;
 			}
+			if(Objects.nonNull(studentExamResult.getResult())){
+				continue;
+			}
 			List<ExamReview> reviews = registReviewMap.get(studentExamResult.getExamRegistrationId());
 			if(CollectionUtils.isEmpty(reviews)){
 				continue;

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/SubjectServiceImpl.java

@@ -102,6 +102,11 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject> implem
     }
 
     @Override
+    public List<Subject> findExamRegistSubjects(Long examId) {
+        return subjectDao.findExamRegistSubjects(examId);
+    }
+
+    @Override
     public List<Subject> findBySubjectByIdList(List<Integer> subjectIdList) {
         return subjectDao.findBySubjectByIdList(StringUtils.join(subjectIdList,","));
     }

edu-user/edu-user-biz/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -126,4 +126,10 @@
         SELECT COUNT(0) FROM exam_subject es
         WHERE es.subject_id_ IN (SELECT s.id_ FROM `subject` s WHERE s.id_ = #{id});
     </select>
+
+    <select id="findExamRegistSubjects" resultType="com.keao.edu.user.entity.Subject">
+        SELECT DISTINCT s.* FROM exam_registration er
+        LEFT JOIN `subject` s ON er.subject_id_=s.id_
+        WHERE er.examination_basic_id_=#{examId}
+    </select>
 </mapper>

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/SubjectController.java

@@ -55,6 +55,13 @@ public class SubjectController extends BaseController {
         return succeed(subjectService.queryPage(queryInfo));
     }
 
+    @ApiOperation(value = "获取考级项目学员报考科目列表")
+    @GetMapping("/findExamRegistSubjects")
+    @PreAuthorize("@pcs.hasPermissions('subject/findExamRegistSubjects')")
+    public HttpResponseResult findExamRegistSubjects(Long examId){
+        return succeed(subjectService.findExamRegistSubjects(examId));
+    }
+
     @ApiOperation(value = "学生端分页查询科目列表")
     @GetMapping("/studentQueryPage")
     @PreAuthorize("@pcs.hasPermissions('studentExamResult/studentQueryPage')")