Joburgess 5 years ago
parent
commit
6f9a212bac

+ 11 - 0
edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExaminationBasic.java

@@ -58,6 +58,9 @@ public class ExaminationBasic {
 	@ApiModelProperty(value = "背景图")
 	private String posterBackgroundImg;
 
+	@ApiModelProperty(value = "自定义简章")
+	private String customPoster;
+
 	@ApiModelProperty(value = "合作单位编号")
 	private Integer organId;
 
@@ -139,6 +142,14 @@ public class ExaminationBasic {
 		this.status = status;
 	}
 
+	public String getCustomPoster() {
+		return customPoster;
+	}
+
+	public void setCustomPoster(String customPoster) {
+		this.customPoster = customPoster;
+	}
+
 	public void setEnrollStartTime(java.util.Date enrollStartTime){
 		this.enrollStartTime = enrollStartTime;
 	}

+ 9 - 2
edu-user/edu-user-server/src/main/resources/config/mybatis/ExaminationBasicMapper.xml

@@ -22,6 +22,7 @@
 		<result column="poster_title_" property="posterTitle" />
 		<result column="poster_profile_" property="posterProfile" />
 		<result column="poster_background_img_" property="posterBackgroundImg" />
+		<result column="custom_poster_" property="customPoster"/>
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="tenant_id_" property="tenantId" />
@@ -51,11 +52,11 @@
 	<insert id="insert" parameterType="com.keao.edu.user.entity.ExaminationBasic" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO examination_basic (id_,name_,exam_mode_,exam_location_id_list_,exam_location_name_list_,status_,enroll_start_time_,enroll_end_time_,
 		expect_exam_start_time_,expect_exam_end_time_,actual_exam_start_time_,actual_exam_end_time_,
-		poster_title_,poster_profile_,poster_background_img_,creator_id_,create_time_,update_time_,tenant_id_,memo_,organ_id_)
+		poster_title_,poster_profile_,poster_background_img_,custom_poster_,creator_id_,create_time_,update_time_,tenant_id_,memo_,organ_id_)
 		VALUES(#{id},#{name},#{examMode,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{examLocationIdList},#{examLocationNameList},
 		#{status,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{enrollStartTime},#{enrollEndTime},
 		#{expectExamStartTime},#{expectExamEndTime},#{actualExamStartTime},#{actualExamEndTime},
-		#{posterTitle},#{posterProfile},#{posterBackgroundImg},#{creatorId},NOW(),NOW(),#{tenantId},#{memo},#{organId})
+		#{posterTitle},#{posterProfile},#{posterBackgroundImg},#{customPoster},#{creatorId},NOW(),NOW(),#{tenantId},#{memo},#{organId})
 	</insert>
 
 	<update id="update" parameterType="com.keao.edu.user.entity.ExamOrganizationRelation">
@@ -99,6 +100,9 @@
 			<if test="posterBackgroundImg != null">
 				poster_background_img_ = #{posterBackgroundImg},
 			</if>
+			<if test="customPoster != null">
+				custom_poster_ = #{customPoster},
+			</if>
 			<if test="tenantId != null">
 				tenant_id_ = #{tenantId},
 			</if>
@@ -154,6 +158,9 @@
 				<if test="exam.posterBackgroundImg != null">
 					poster_background_img_ = #{exam.posterBackgroundImg},
 				</if>
+				<if test="exam.customPoster != null">
+					custom_poster_ = #{exam.customPoster},
+				</if>
 				<if test="exam.tenantId != null">
 					tenant_id_ = #{exam.tenantId},
 				</if>