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

edu-task/src/main/resources/application.yml

@@ -48,7 +48,7 @@ spring:
     maxOpenPreparedStatements: 20
 
   redis:
-    host: 47.114.1.200
+    host: 47.114.176.40
     port: 6379
     password: dyym
     database: 0

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

@@ -54,7 +54,7 @@ public class ExamOrganizationRelationController extends BaseController {
 
     @ApiOperation("添加合作单位")
     @PostMapping(value = "/addExamOrganizations")
-    public HttpResponseResult addExamOrganizations(Integer examId, String organIds){
+    public HttpResponseResult addExamOrganizations(Long examId, String organIds){
         examOrganizationRelationService.addExamOrganizations(examId, organIds);
         return succeed();
     }

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

@@ -46,6 +46,18 @@ public class ExamRoomController extends BaseController {
         return succeed(examRoomService.queryExamRoomPage(queryInfo));
     }
 
+    @ApiOperation("发送考试安排")
+    @GetMapping(value = "/sendExamPlan")
+    public HttpResponseResult sendExamPlan(Integer examId){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        Employee employee = employeeService.get(sysUser.getId());
+        if(Objects.isNull(employee)){
+            return failed("用户信息异常");
+        }
+        examRoomService.sendExamPlan(employee.getOrganId(), examId);
+        return succeed();
+    }
+
     @ApiOperation("获取考级项目教室列表")
     @GetMapping(value = "/queryExamRooms")
     public HttpResponseResult<PageInfo<ExamRoomDto>> queryExamRooms(ExamRoomQueryInfo queryInfo) {

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

@@ -8,6 +8,7 @@ import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.user.dto.ExaminationBasicDto;
 import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.entity.ExaminationBasic;
+import com.keao.edu.user.enums.ExamStatusEnum;
 import com.keao.edu.user.page.ExaminationQueryInfo;
 import com.keao.edu.user.service.EmployeeService;
 import com.keao.edu.user.service.ExaminationBasicService;
@@ -74,6 +75,13 @@ public class ExaminationBasicController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation("更新考级项目状态")
+    @PostMapping(value = "/updateExamBasicStatus")
+    public HttpResponseResult updateExamBasicStatus(Long examId, ExamStatusEnum statusEnum){
+        examinationBasicService.updateExamBasicStatus(examId, statusEnum);
+        return succeed();
+    }
+
     @ApiOperation("关闭考级项目")
     @PostMapping(value = "/closeExam")
     public HttpResponseResult closeExam(Integer examId, String reason){

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dto/ExamReviewDto.java

@@ -5,6 +5,8 @@ import com.keao.edu.user.entity.ExamRegistration;
 import com.keao.edu.user.entity.ExamReview;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.Date;
+
 /**
  * @Author Joburgess
  * @Date 2020.06.24
@@ -17,6 +19,17 @@ public class ExamReviewDto extends ExamReview {
     @ApiModelProperty(value = "考生报名信息")
     private ExamRegistration examRegistration;
 
+    @ApiModelProperty(value = "考试时间")
+    private Date examStartTime;
+
+    public Date getExamStartTime() {
+        return examStartTime;
+    }
+
+    public void setExamStartTime(Date examStartTime) {
+        this.examStartTime = examStartTime;
+    }
+
     public SysUser getStudentInfo() {
         return studentInfo;
     }

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

@@ -1,6 +1,7 @@
 package com.keao.edu.user.entity;
 
 import com.keao.edu.auth.api.entity.SysUser;
+import com.keao.edu.user.enums.ExamRoomTeaherTypeEnum;
 import com.keao.edu.user.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -17,7 +18,9 @@ public class ExamReview {
 	private Long examRegistrationId;
 
 	@ApiModelProperty(value = "考试编号")
-	private Integer examinationBasicId;
+	private Long examinationBasicId;
+
+	private Long examRoomId;
 	
 	/**  */
 	@ApiModelProperty(value = "教师编号")
@@ -32,6 +35,9 @@ public class ExamReview {
 	/** 评价 */
 	@ApiModelProperty(value = "评价")
 	private String evaluationContent;
+
+	@ApiModelProperty(value = "教师属性")
+	private ExamRoomTeaherTypeEnum teacherType;
 	
 	/** 结果 */
 	@ApiModelProperty(value = "结果")
@@ -65,6 +71,14 @@ public class ExamReview {
 		this.examinationBasic = examinationBasic;
 	}
 
+	public Long getExamRoomId() {
+		return examRoomId;
+	}
+
+	public void setExamRoomId(Long examRoomId) {
+		this.examRoomId = examRoomId;
+	}
+
 	public void setId(Long id){
 		this.id = id;
 	}
@@ -81,14 +95,14 @@ public class ExamReview {
 		this.teacher = teacher;
 	}
 
-	public void setExaminationBasicId(Integer examinationBasicId){
-		this.examinationBasicId = examinationBasicId;
+	public Long getExaminationBasicId() {
+		return examinationBasicId;
 	}
-	
-	public Integer getExaminationBasicId(){
-		return this.examinationBasicId;
+
+	public void setExaminationBasicId(Long examinationBasicId) {
+		this.examinationBasicId = examinationBasicId;
 	}
-			
+
 	public void setTeacherId(Integer teacherId){
 		this.teacherId = teacherId;
 	}
@@ -96,7 +110,15 @@ public class ExamReview {
 	public Integer getTeacherId(){
 		return this.teacherId;
 	}
-			
+
+	public ExamRoomTeaherTypeEnum getTeacherType() {
+		return teacherType;
+	}
+
+	public void setTeacherType(ExamRoomTeaherTypeEnum teacherType) {
+		this.teacherType = teacherType;
+	}
+
 	public void setStudentId(Integer studentId){
 		this.studentId = studentId;
 	}

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

@@ -0,0 +1,38 @@
+package com.keao.edu.user.enums;
+
+import com.keao.edu.common.enums.BaseEnum;
+
+/**
+ * @Author Joburgess
+ * @Date 2020.07.13
+ **/
+public enum ExamRoomTeaherTypeEnum implements BaseEnum<String, ExamRoomTeaherTypeEnum> {
+
+    MAIN("MAIN", "主考"),
+    ASSISTANT("ASSISTANT", "监考");
+
+    private String code;
+
+    private String msg;
+
+    ExamRoomTeaherTypeEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    @Override
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/page/ExamReviewQueryInfo.java

@@ -1,6 +1,7 @@
 package com.keao.edu.user.page;
 
 import com.keao.edu.common.page.QueryInfo;
+import com.keao.edu.user.enums.ExamRoomTeaherTypeEnum;
 import com.keao.edu.user.enums.StudentRegistrationStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -42,6 +43,12 @@ public class ExamReviewQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "评审时间")
     private String endTime;
 
+    @ApiModelProperty(value = "教师属性")
+    private ExamRoomTeaherTypeEnum teacherType;
+
+    @ApiModelProperty(value = "考试时间")
+    private String examStartTime;
+
     public Long getRegistId() {
         return registId;
     }
@@ -50,6 +57,22 @@ public class ExamReviewQueryInfo extends QueryInfo {
         this.registId = registId;
     }
 
+    public ExamRoomTeaherTypeEnum getTeacherType() {
+        return teacherType;
+    }
+
+    public void setTeacherType(ExamRoomTeaherTypeEnum teacherType) {
+        this.teacherType = teacherType;
+    }
+
+    public String getExamStartTime() {
+        return examStartTime;
+    }
+
+    public void setExamStartTime(String examStartTime) {
+        this.examStartTime = examStartTime;
+    }
+
     public String getStartTime() {
         return startTime;
     }

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

@@ -26,7 +26,7 @@ public interface ExamOrganizationRelationService extends BaseService<Long, ExamO
      * @param orgainIdsStr:
      * @return void
      */
-    void addExamOrganizations(Integer examId, String orgainIdsStr);
+    void addExamOrganizations(Long examId, String orgainIdsStr);
 
     /**
      * @describe 更新考级项目与合作单位关联信息

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

@@ -4,6 +4,7 @@ import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.BaseService;
 import com.keao.edu.user.dto.ExaminationBasicDto;
 import com.keao.edu.user.entity.ExaminationBasic;
+import com.keao.edu.user.enums.ExamStatusEnum;
 import com.keao.edu.user.page.ExaminationQueryInfo;
 
 public interface ExaminationBasicService extends BaseService<Long, ExaminationBasic> {
@@ -26,6 +27,16 @@ public interface ExaminationBasicService extends BaseService<Long, ExaminationBa
     void updateExamStatus();
 
     /**
+     * @describe
+     * @author Joburgess
+     * @date 2020.07.13
+     * @param examId:
+     * @param statusEnum:
+     * @return
+     */
+    void updateExamBasicStatus(Long examId, ExamStatusEnum statusEnum);
+
+    /**
      * @describe 获取考级项目
      * @author Joburgess
      * @date 2020.06.27

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

@@ -104,7 +104,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void addExamOrganizations(Integer examId, String orgainIdsStr) {
+	public void addExamOrganizations(Long examId, String orgainIdsStr) {
 		if(Objects.isNull(examId)){
 			throw new BizException("请指定考级项目");
 		}
@@ -119,7 +119,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 			throw new BizException("当前状态暂不可添加合作单位");
 		}
 
-		Set<Integer> organIdsWithExam = examOrganizationRelationDao.getOrganIdsWithExam(examId);
+		Set<Integer> organIdsWithExam = examOrganizationRelationDao.getOrganIdsWithExam(examId.intValue());
 		List<Integer> organIds = Arrays.stream(orgainIdsStr.split(",")).map(e -> Integer.valueOf(e)).collect(Collectors.toList());
 		List<Organization> organs = organizationDao.getOrgans(organIds);
 		if(organs.size()!=organIds.size()){
@@ -141,7 +141,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 			}
 			ExamOrganizationRelation og = new ExamOrganizationRelation();
 			og.setTenantId(TenantContextHolder.getTenantId());
-			og.setExaminationBasicId(examId);
+			og.setExaminationBasicId(examId.intValue());
 			og.setOrganId(organId);
 			Organization organization = idOrganMap.get(organId);
 			if(Objects.isNull(organization)){

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

@@ -9,6 +9,7 @@ import com.keao.edu.common.service.impl.BaseServiceImpl;
 import com.keao.edu.user.dao.ExamReviewDao;
 import com.keao.edu.user.dto.ExamReviewDto;
 import com.keao.edu.user.entity.ExamReview;
+import com.keao.edu.user.entity.ExaminationBasic;
 import com.keao.edu.user.entity.Subject;
 import com.keao.edu.user.enums.YesOrNoEnum;
 import com.keao.edu.user.page.ExamReviewQueryInfo;
@@ -53,12 +54,18 @@ public class ExamReviewServiceImpl extends BaseServiceImpl<Long, ExamReview> imp
 			params.put("offset", pageInfo.getOffset());
 			dataList = examReviewDao.findExamResult(params);
 			List<Integer> teacherIds = dataList.stream().map(ExamReviewDto::getTeacherId).collect(Collectors.toList());
+			List<Integer> studentIds = dataList.stream().map(ExamReviewDto::getStudentId).collect(Collectors.toList());
+			List<Long> examIds = dataList.stream().map(ExamReviewDto::getExaminationBasicId).collect(Collectors.toList());
 			List<Integer> subjectIds = dataList.stream().map(e->e.getExamRegistration().getSubjectId()).collect(Collectors.toList());
 			Map<Integer, String> teacherIdNameMap = this.getMap("sys_user", "id_", "real_name_", teacherIds, Integer.class, String.class);
+			Map<Integer, String> studentIdNameMap = this.getMap("sys_user", "id_", "real_name_", studentIds, Integer.class, String.class);
 			Map<Integer, String> subjectIdNameMap = this.getMap("subject", "id_", "name_", subjectIds, Integer.class, String.class);
+			Map<Long, String> examIdNameMap = this.getMap("examination_basic", "id_", "name_", examIds, Long.class, String.class);
 			for (ExamReviewDto e : dataList) {
-				e.setTeacher(new SysUser(e.getStudentId(),teacherIdNameMap.get(e.getStudentId())));
+				e.setTeacher(new SysUser(e.getTeacherId(),teacherIdNameMap.get(e.getTeacherId())));
 				e.getExamRegistration().setSubject(new Subject(e.getExamRegistration().getSubjectId(), subjectIdNameMap.get(e.getExamRegistration().getSubjectId())));
+				e.setStudentInfo(new SysUser(e.getStudentId(), studentIdNameMap.get(e.getStudentId())));
+				e.setExaminationBasic(new ExaminationBasic(e.getExaminationBasicId(), examIdNameMap.get(e.getExaminationBasicId())));
 			}
 		}
 		pageInfo.setRows(dataList);

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

@@ -12,6 +12,7 @@ import com.keao.edu.user.dto.ExaminationBasicDto;
 import com.keao.edu.user.entity.*;
 import com.keao.edu.user.enums.ExamStatusEnum;
 import com.keao.edu.user.page.ExaminationQueryInfo;
+import com.keao.edu.user.service.ExamOrganizationRelationService;
 import com.keao.edu.user.service.ExaminationBasicService;
 import com.keao.edu.user.service.OrganizationService;
 import com.keao.edu.util.collection.MapUtil;
@@ -31,6 +32,8 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
     @Autowired
     private ExaminationBasicDao examinationBasicDao;
     @Autowired
+    private ExamOrganizationRelationService examOrganizationRelationService;
+    @Autowired
     private ExamOrganizationRelationDao examOrganizationRelationDao;
     @Autowired
     private MusicTheoryDao musicTheoryDao;
@@ -49,6 +52,7 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ExaminationBasic addExaminationBasic(ExaminationBasic examinationBasic) {
         if (StringUtils.isBlank(examinationBasic.getName())) {
             throw new BizException("请填写项目名称");
@@ -93,7 +97,6 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
         }
 
         examMusicTheoryDao.batchInsert(examMusicTheories);
-
         return examinationBasic;
     }
 
@@ -120,6 +123,25 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
     }
 
     @Override
+    public void updateExamBasicStatus(Long examId, ExamStatusEnum statusEnum) {
+        if(Objects.isNull(examId)){
+            throw new BizException("请指定考级项目");
+        }
+        ExaminationBasic existsExam = examinationBasicDao.get(examId);
+        if(Objects.isNull(existsExam)){
+            throw new BizException("考级项目不存在");
+        }
+        existsExam.setStatus(statusEnum);
+        if(ExamStatusEnum.SETTING.equals(existsExam.getStatus())&&ExamStatusEnum.NOT_START.equals(existsExam.getStatus())){
+            examOrganizationRelationService.addExamOrganizations(existsExam.getId(),existsExam.getOrganId().toString());
+        }
+        switch (statusEnum){
+//            cas
+        }
+        examinationBasicDao.update(existsExam);
+    }
+
+    @Override
     public PageInfo<ExaminationBasicDto> findExaminationBasics(ExaminationQueryInfo queryInfo) {
         PageInfo<ExaminationBasicDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
         Map<String, Object> params = new HashMap<String, Object>();

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

@@ -271,7 +271,7 @@
 		LEFT JOIN exam_room_student_relation ersr ON ersr.student_id_ = er.student_id_
 		WHERE 1=1
 		<if test="organIds!=null">
-			AND ersr.organ_id_ IN
+			AND er.organ_id_ IN
 			<foreach collection="organIds" item="organI" separator="," open="(" close=")">
 				#{organI}
 			</foreach>

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

@@ -10,7 +10,9 @@
 		<result column="id_" property="id" />
 		<result column="examination_basic_id_" property="examinationBasicId" />
 		<result column="exam_registration_id_" property="examRegistrationId" />
+		<result column="exam_room_id_" property="examRoomId" />
 		<result column="teacher_id_" property="teacherId" />
+		<result column="teacher_type_" property="teacherType"/>
 		<result column="student_id_" property="studentId" />
 		<result column="evaluation_content_" property="evaluationContent" />
 		<result column="evaluation_result_" property="evaluationResult"/>
@@ -18,10 +20,11 @@
 		<result column="update_time_" property="updateTime" />
 		<result column="tenant_id_" property="tenantId" />
 		<result column="enable_edit_" property="enableEdit" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
-		<association property="examinationBasic" javaType="com.keao.edu.user.entity.ExaminationBasic"/>
+		<association property="examinationBasic" column="exam_" resultMap="com.keao.edu.user.dao.ExaminationBasicDao.ExaminationBasic"/>
 	</resultMap>
 
 	<resultMap id="ExamReviewDto" type="com.keao.edu.user.dto.ExamReviewDto" extends="ExamReview">
+		<result column="exam_start_time_" property="examStartTime"/>
 		<association property="examRegistration" columnPrefix="regist_" resultMap="com.keao.edu.user.dao.ExamRegistrationDao.ExamRegistration"/>
 	</resultMap>
 	
@@ -37,9 +40,9 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.entity.ExamReview" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO exam_review (id_,examination_basic_id_,teacher_id_,student_id_,evaluation_content_,
+		INSERT INTO exam_review (id_,examination_basic_id_,exam_room_id_,teacher_id_,teacher_type_,student_id_,evaluation_content_,
 		evaluation_result_,create_time_,update_time_,tenant_id_,enable_edit_,exam_registration_id_)
-		VALUES(#{id},#{examinationBasicId},#{teacherId},#{studentId},#{evaluationContent},
+		VALUES(#{id},#{examinationBasicId},#{examRoomId},#{teacherId},#{teacherType},#{studentId},#{evaluationContent},
 		#{evaluationResult},NOW(),NOW(),
 		#{tenantId},#{enableEdit,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{examRegistrationId})
 	</insert>
@@ -54,9 +57,15 @@
 			<if test="examRegistrationId != null">
 				exam_registration_id_ = #{examRegistrationId},
 			</if>
+			<if test="examRoomId != null">
+				exam_room_id_ = #{examRoomId},
+			</if>
 			<if test="teacherId != null">
 				teacher_id_ = #{teacherId},
 			</if>
+			<if test="teacherType != null">
+				teacher_type_ = #{teacherType},
+			</if>
 			<if test="evaluationResult != null">
 				evaluation_result_ = #{evaluationResult},
 			</if>
@@ -122,6 +131,15 @@
 			<if test="studentStatus!=null">
 				AND ere.status_=#{studentStatus,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
 			</if>
+			<if test="teacherType!=null">
+				AND er.teacher_type_=#{teacherType}
+			</if>
+			<if test="examStartTime!=null">
+				AND DATE_FORMAT( ero.exam_start_time_, '%Y-%m-%d' ) = #{examStartTime}
+			</if>
+			<if test="search!=null and search!=''">
+				AND er.real_name_ LIKE CONCAT(#{search}, '%')
+			</if>
 		</where>
 	</sql>
 	<select id="findExamResult" resultMap="ExamReviewDto">
@@ -132,10 +150,14 @@
 			ere.organ_id_ regist_organ_id_,
 			ere.subject_id_ regist_subject_id_,
 			ere.level_ regist_level_,
-			ere.status_ regist_status_
+			ere.status_ regist_status_,
+			ere.card_no_ regist_card_no_,
+			ero.exam_start_time_
 		FROM
 			exam_review er
 			LEFT JOIN exam_registration ere ON ere.id_=er.exam_registration_id_
+			LEFT JOIN exam_room ero ON ero.id_=er.exam_room_id_
+			LEFT JOIN sys_user su ON su.id_=er.teacher_id_
 		<include refid="findExamResultCondition"/>
 		ORDER BY ere.id_ DESC
 		<include refid="global.limit"/>
@@ -146,6 +168,7 @@
 		FROM
 			exam_review er
 			LEFT JOIN exam_registration ere ON ere.id_=er.exam_registration_id_
+			LEFT JOIN sys_user su ON su.id_=er.teacher_id_
 		<include refid="findExamResultCondition"/>
 	</select>
 </mapper>

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

@@ -158,6 +158,7 @@
 	<select id="queryStudentExamResult" resultMap="StudentExamResult" parameterType="map">
 		SELECT
 			ser.*,
+			er.id_ regist_id_,
 			er.card_no_ regist_card_no_,
 			er.student_id_ regist_student_id_,
 			er.organ_id_ regist_organ_id_,