Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TeacherLeaveRecord.java

@@ -19,7 +19,7 @@ public class TeacherLeaveRecord {
 	private double days;
 	
 	/** 请假类型 */
-	private String type;
+	private Integer leaveCategoryId;
 	
 	/** 请假状态（审批中、拒绝、通过） */
 	private AuditStatusEnum status;
@@ -72,14 +72,14 @@ public class TeacherLeaveRecord {
 		return this.days;
 	}
 			
-	public void setType(String type){
-		this.type = type;
+	public Integer getLeaveCategoryId() {
+		return leaveCategoryId;
 	}
-	
-	public String getType(){
-		return this.type;
+
+	public void setLeaveCategoryId(Integer leaveCategoryId) {
+		this.leaveCategoryId = leaveCategoryId;
 	}
-			
+
 	public void setStatus(AuditStatusEnum status){
 		this.status = status;
 	}

mec-biz/src/main/resources/config/mybatis/TeacherLeaveRecordMapper.xml

@@ -3,12 +3,12 @@
 <!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
 <mapper namespace="com.ym.mec.biz.dal.dao.TeacherLeaveRecordDao">
 
-	<resultMap type="com.ym.mec.biz.dal.entity.TeacherLeaveRecord"
+	<resultMap leaveCategoryId="com.ym.mec.biz.dal.entity.TeacherLeaveRecord"
 		id="TeacherLeaveRecord">
 		<result column="id_" property="id" />
 		<result column="user_id_" property="userId" />
 		<result column="days_" property="days" />
-		<result column="type_" property="type" />
+		<result column="leave_category_id_" property="leaveCategoryId" />
 		<result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
 		<result column="remark_" property="remark" />
 		<result column="create_time_" property="createTime" />
@@ -38,8 +38,8 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO teacher_leave_record
-		(id_,user_id_,days_,type_,status_,remark_,create_time_,update_time_,start_time_,end_time_,courses_schedule_json_,wf_process_id_,wf_order_id_)
-		VALUES(#{id},#{userId},#{days},#{type},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{remark},#{createTime},#{updateTime},#{startTime},#{endTime},#{coursesScheduleJson},#{wfProcessId},#{wfOrderId})
+		(id_,user_id_,days_,leave_category_id_,status_,remark_,create_time_,update_time_,start_time_,end_time_,courses_schedule_json_,wf_process_id_,wf_order_id_)
+		VALUES(#{id},#{userId},#{days},#{leaveCategoryId},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{remark},#{createTime},#{updateTime},#{startTime},#{endTime},#{coursesScheduleJson},#{wfProcessId},#{wfOrderId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -82,8 +82,8 @@
 			<if test="updateTime != null">
 				update_time_ = #{updateTime},
 			</if>
-			<if test="type != null">
-				type_ = #{type},
+			<if test="leaveCategoryId != null">
+				leave_category_id_ = #{leaveCategoryId},
 			</if>
 		</set>
 		WHERE id_ = #{id}