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

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamRegistration.java

@@ -25,7 +25,7 @@ public class ExamRegistration {
 	private Integer studentId;
 
 	@ApiModelProperty(value = "学员基本信息")
-	private SysUser sysUser;
+	private Student sysUser;
 
 	@ApiModelProperty(value = "合作单位编号")
 	private Integer organId;
@@ -117,11 +117,11 @@ public class ExamRegistration {
 		this.status = status;
 	}
 
-	public SysUser getSysUser() {
+	public Student getSysUser() {
 		return sysUser;
 	}
 
-	public void setSysUser(SysUser sysUser) {
+	public void setSysUser(Student sysUser) {
 		this.sysUser = sysUser;
 	}
 

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

@@ -8,6 +8,8 @@ import com.keao.edu.user.dto.ExamRoomDto;
 import com.keao.edu.user.dto.ExamRoomStatisticsDto;
 import com.keao.edu.user.page.ExamRoomQueryInfo;
 
+import java.util.List;
+
 public interface ExamRoomService extends BaseService<Long, ExamRoom> {
 
     /**
@@ -61,4 +63,13 @@ public interface ExamRoomService extends BaseService<Long, ExamRoom> {
      * @return com.keao.edu.user.dto.ExamRoomStatisticsDto
      */
     ExamRoomStatisticsDto getExamRoomStatisticsInfo(Integer organId, Integer examId);
+
+    /**
+     * @describe 教师教室冲突检测
+     * @author Joburgess
+     * @date 2020.07.07
+     * @param examRooms:
+     * @return void
+     */
+    void checkRoomTeachers(List<ExamRoom> examRooms);
 }

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

@@ -25,6 +25,7 @@ import com.keao.edu.user.service.OrganizationService;
 import com.keao.edu.util.collection.MapUtil;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -180,4 +181,14 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 
         return examRoomStatisticsInfo;
 	}
+
+	@Override
+	public void checkRoomTeachers(List<ExamRoom> examRooms) {
+		List<String> days=new ArrayList<>();
+		for (ExamRoom examRoom : examRooms) {
+			if(Objects.nonNull(examRoom.getExamStartTime())){
+//				days.add(DateUtils)
+			}
+		}
+	}
 }

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

@@ -5,6 +5,7 @@ import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.exception.BizException;
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
+import com.keao.edu.user.api.entity.Student;
 import com.keao.edu.user.dao.ExaminationBasicDao;
 import com.keao.edu.user.dao.StudentExamResultDao;
 import com.keao.edu.user.dto.StudentExamResultStatisticsDto;
@@ -61,7 +62,8 @@ public class StudentExamResultServiceImpl extends BaseServiceImpl<Long, StudentE
 			Map<Integer, String> subjectIdNameMap = this.getMap("subject", "id_", "name_", subjectIds, Integer.class, String.class);
 			Map<Integer, String> organIdNameMap = this.getMap("organization", "id_", "name_", organIds, Integer.class, String.class);
 			for (StudentExamResult s : dataList) {
-				s.getExamRegistration().setSysUser(new SysUser(s.getStudentId(), studentIdNameMap.get(s.getStudentId())));
+				Student student=new Student(s.getStudentId(), studentIdNameMap.get(s.getStudentId()));
+				s.getExamRegistration().setSysUser(student);
 				s.getExamRegistration().setSubject(new Subject(s.getExamRegistration().getSubjectId(), subjectIdNameMap.get(s.getExamRegistration().getSubjectId())));
 				s.getExamRegistration().setOrganization(new Organization(s.getExamRegistration().getOrganId(), organIdNameMap.get(s.getExamRegistration().getSubjectId())));
 			}

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

@@ -18,6 +18,7 @@
 		<result column="last_exam_level_" property="lastExamLevel" />
 		<result column="last_exam_certificate_url_" property="lastExamCertificateUrl" />
 		<result column="exam_music_theory_level_" property="examMusicTheoryLevel" />
+		<result column="last_music_theory_certificate_url_" property="lastMusicTheoryCertificateUrl"/>
 		<result column="theory_level_fee_" property="theoryLevelFee" />
 		<result column="adviser_name_" property="adviserName" />
 		<result column="adviser_phone_" property="adviserPhone" />
@@ -27,7 +28,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" columnPrefix="sys_user_" resultMap="com.keao.edu.user.dao.StudentDao.Student"/>
 		<association property="subject" columnPrefix="subject_" resultMap="com.keao.edu.user.dao.SubjectDao.Subject"/>
 	</resultMap>
 
@@ -146,6 +147,8 @@
 			er.card_no_,
 			er.student_id_,
 			su.real_name_ sys_user_real_name_,
+			er.last_exam_certificate_url_,
+			er.last_music_theory_certificate_url_,
 			er.level_fee_,
 			er.theory_level_fee_,
 			er.organ_id_,