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

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

@@ -94,7 +94,7 @@ public class ExaminationBasicController extends BaseController {
             }
             organId = employee.getOrganId();
         }
-        examinationBasicService.closeExam(examId, reason);
+        examinationBasicService.closeExam(organId, examId, reason);
         return succeed();
     }
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamRegistrationDao.java

@@ -15,6 +15,7 @@ import java.util.Map;
 public interface ExamRegistrationDao extends BaseDAO<Long, ExamRegistration> {
 
     List<ExamRegistrationRoomDto> queryExamRegist(Map<String, Object> params);
+
     int countExamRegist(Map<String, Object> params);
 
     /**
@@ -74,11 +75,11 @@ public interface ExamRegistrationDao extends BaseDAO<Long, ExamRegistration> {
                                                   @Param("studentIds") List<Integer> studentIds);
 
     /**
+     * @param registIds:
+     * @return java.util.List<com.keao.edu.user.entity.ExamRegistration>
      * @describe 获取指定报名记录
      * @author Joburgess
      * @date 2020.07.12
-     * @param registIds:
-     * @return java.util.List<com.keao.edu.user.entity.ExamRegistration>
      */
     List<ExamRegistration> getRegists(@Param("registIds") List<Long> registIds);
 
@@ -122,8 +123,20 @@ public interface ExamRegistrationDao extends BaseDAO<Long, ExamRegistration> {
 
     /**
      * 获取单条报名信息
+     *
      * @param id
      * @return
      */
     ExamRegistration getExamRegistrationInfo(@Param("id") Integer id);
+
+    /**
+     * 根据考试项目id专业id和等级获取已报名的信息
+     *
+     * @param examId
+     * @param subjectId
+     * @param level
+     * @return
+     */
+    ExamRegistration getRegistration(@Param("examId") Long examId, @Param("studentId") Integer studentId, @Param("subjectId") Integer subjectId, @Param("level") Integer level);
+
 }

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

@@ -62,7 +62,7 @@ public interface ExaminationBasicService extends BaseService<Long, ExaminationBa
      * @param reason: 关闭原因
      * @return void
      */
-    void closeExam(Integer examId, String reason);
+    void closeExam(Integer organId, Integer examId, String reason);
 
     /**
      * 获取考级项目信息

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

@@ -64,7 +64,7 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> addRegistration(ExamRegistration examRegistration) throws Exception {
-        ExaminationBasic examinationBasic = examinationBasicDao.get(examRegistration.getExaminationBasicId().longValue());
+        ExaminationBasic examinationBasic = examinationBasicDao.get(examRegistration.getExaminationBasicId());
         if (examinationBasic == null || !examinationBasic.getStatus().equals(ExamStatusEnum.APPLYING)) {
             throw new BizException("项目不在报名中，请核对");
         }
@@ -82,6 +82,12 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
         if (organization == null) {
             throw new BizException("机构不存在");
         }
+
+        ExamRegistration registration = examRegistrationDao.getRegistration(examinationBasic.getId(), examRegistration.getStudentId(), examRegistration.getSubjectId(), examSubjectSong.getLevel());
+        if(registration != null){
+            throw new BizException("该考级相同专业及等级您已报名，请勿重复报名");
+        }
+
         Date nowDate = new Date();
         String orderNo = idGeneratorService.generatorId("payment") + "";
 

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

@@ -229,7 +229,7 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
     }
 
     @Override
-    public void closeExam(Integer examId, String reason) {
+    public void closeExam(Integer organId, Integer examId, String reason) {
         if (Objects.isNull(examId)) {
             throw new BizException("请指定考级项目");
         }
@@ -238,7 +238,7 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
             throw new BizException("考级项目不存在");
         }
 
-//        List<Integer> childOrganIds = organizationService.getChildOrganIds(queryInfo.getOrganId(), true);
+        List<Integer> childOrganIds = organizationService.getChildOrganIds(organId, true);
 
         if (StringUtils.isBlank(reason)) {
             reason = "后台手动关闭";

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

@@ -423,4 +423,8 @@
 		LEFT JOIN subject s on er.subject_id_ = s.id_
 		WHERE er.id_ = #{id}
 	</select>
+
+	<select id="getRegistration" resultMap="ExamRegistration">
+		SELECT * FROM exam_registration WHERE examination_basic_id_ = #{examId}  AND student_id_ =#{studentId} AND subject_id_=#{subjectId} AND level_ = #{level} LIMIT 1
+	</select>
 </mapper>