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

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/ExamRoom.java

@@ -1,5 +1,6 @@
 package com.keao.edu.user.api.entity;
 
+import com.keao.edu.common.enums.YesOrNoEnum;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -28,9 +29,11 @@ public class ExamRoom {
 	private String assistantTeacherUserIdList;
 	
 	/** 考试时间（json格式） */
-	private String examTimeJson;
+	private String examTime;
 
 	private Integer organId;
+
+	private YesOrNoEnum examPlanPushFlag;
 	
 	/**  */
 	private boolean delFlag;
@@ -99,14 +102,6 @@ public class ExamRoom {
 	public String getAssistantTeacherUserIdList(){
 		return this.assistantTeacherUserIdList;
 	}
-			
-	public void setExamTimeJson(String examTimeJson){
-		this.examTimeJson = examTimeJson;
-	}
-	
-	public String getExamTimeJson(){
-		return this.examTimeJson;
-	}
 
 	public Integer getOrganId() {
 		return organId;
@@ -139,7 +134,23 @@ public class ExamRoom {
 	public java.util.Date getUpdateTime(){
 		return this.updateTime;
 	}
-			
+
+	public String getExamTime() {
+		return examTime;
+	}
+
+	public void setExamTime(String examTime) {
+		this.examTime = examTime;
+	}
+
+	public YesOrNoEnum getExamPlanPushFlag() {
+		return examPlanPushFlag;
+	}
+
+	public void setExamPlanPushFlag(YesOrNoEnum examPlanPushFlag) {
+		this.examPlanPushFlag = examPlanPushFlag;
+	}
+
 	public void setTenantId(String tenantId){
 		this.tenantId = tenantId;
 	}

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

@@ -84,7 +84,7 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 		if(Objects.isNull(examRoom.getMainTeacherUserId())){
 			throw new BizException("请指定主考老师");
 		}
-		if(StringUtils.isBlank(examRoom.getExamTimeJson())){
+		if(StringUtils.isBlank(examRoom.getExamTime())){
 			throw new BizException("请指定考试时间");
 		}
 		examRoomDao.update(examRoom);

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

@@ -14,9 +14,10 @@
 		<result column="subject_id_list_" property="subjectIdList" />
 		<result column="main_teacher_user_id_" property="mainTeacherUserId" />
 		<result column="assistant_teacher_user_id_list_" property="assistantTeacherUserIdList" />
-		<result column="exam_time_json_" property="examTimeJson" />
+		<result column="exam_time_" property="examTime" />
 		<result column="del_flag_" property="delFlag" />
 		<result column="organ_id_" property="organId"/>
+		<result column="exam_plan_push_flag_" property="examPlanPushFlag"/>
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="tenant_id_" property="tenantId" />
@@ -35,9 +36,9 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.api.entity.ExamRoom" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO exam_room (id_,examination_basic_id_,exam_mode_,exam_location_id_,subject_id_list_,main_teacher_user_id_,
-		assistant_teacher_user_id_list_,exam_time_json_,del_flag_,organ_id_,create_time_,update_time_,tenant_id_)
+		assistant_teacher_user_id_list_,exam_time_,del_flag_,organ_id_,exam_plan_push_flag_,create_time_,update_time_,tenant_id_)
 		VALUES(#{id},#{examinationBasicId},#{examMode},#{examLocationId},#{subjectIdList},#{mainTeacherUserId},#{assistantTeacherUserIdList},
-		#{examTimeJson},#{delFlag},#{organId},NOW(),NOW(),#{tenantId})
+		#{examTime},#{delFlag},#{organId},#{examPlanPushFlag},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -51,7 +52,7 @@
 				examination_basic_id_ = #{examinationBasicId},
 			</if>
 			<if test="examTimeJson != null">
-				exam_time_json_ = #{examTimeJson},
+				exam_time_ = #{examTime},
 			</if>
 			<if test="subjectIdList != null">
 				subject_id_list_ = #{subjectIdList},
@@ -74,6 +75,9 @@
 			<if test="organId != null">
 				organ_id_ = #{organId},
 			</if>
+			<if test="examPlanPushFlag != null">
+				exam_plan_push_flag_ = #{examPlanPushFlag},
+			</if>
 				update_time_ = NOW()
 		</set> WHERE id_ = #{id}
 	</update>