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

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -30,7 +30,7 @@ public class SysUser {
 	private String salt;
 
 	/** 简介 */
-	@ApiModelProperty(value = "菜单ID",required = false)
+	@ApiModelProperty(value = "手机号",required = false)
 	private String phone;
 
 	/** 头像 */

mec-web/src/main/java/com/ym/mec/web/controller/teacher/TeacherAttendanceController.java

@@ -25,14 +25,14 @@ public class TeacherAttendanceController extends BaseController {
     }
 
     @ApiOperation(value = "分页查询教师签到列表")
-    @PostMapping("/queryPage")
-    public Object queryPage(@RequestBody TeacherAttendanceQueryInfo queryInfo) {
+    @GetMapping("/queryPage")
+    public Object queryPage(TeacherAttendanceQueryInfo queryInfo) {
         return succeed(teacherAttendanceService.queryPage(queryInfo));
     }
 
     @ApiOperation(value = "查询教师签到记录")
     @GetMapping("/getTeacherPersonalAttendances")
-    public Object getTeacherPersonalAttendances(@RequestBody TeacherAttendanceQueryInfo queryInfo){
+    public Object getTeacherPersonalAttendances(TeacherAttendanceQueryInfo queryInfo){
         return teacherAttendanceService.getTeacherPersonalAttendances(queryInfo);
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/teacher/TeacherCourseHomeworkReplyController.java

@@ -24,19 +24,19 @@ public class TeacherCourseHomeworkReplyController extends BaseController {
 
     @ApiOperation(value = "新增回复")
     @PostMapping("/add")
-    public Object add(@RequestBody StudentCourseHomeworkReply studentCourseHomeworkReply) {
+    public Object add(StudentCourseHomeworkReply studentCourseHomeworkReply) {
         studentCourseHomeworkReplyService.insert(studentCourseHomeworkReply);
         return succeed();
     }
 
     @ApiOperation(value = "回复查询")
     @GetMapping("/queryPage")
-    public Object queryPage(@RequestBody StudentCourseHomeworkReplyQueryInfo queryInfo){
+    public Object queryPage(StudentCourseHomeworkReplyQueryInfo queryInfo){
         return succeed(studentCourseHomeworkReplyService.queryPage(queryInfo));
     }
 
     @ApiOperation(value = "删除回复")
-    @DeleteMapping("/del/{id}")
+    @PostMapping("/del/{id}")
     public Object del(@ApiParam(value = "回复ID", required = true) @PathVariable("id") Long id){
         studentCourseHomeworkReplyService.delete(id);
         return succeed();

mec-web/src/main/java/com/ym/mec/web/controller/teacher/TeacherDefaultMusicGroupSalaryController.java

@@ -0,0 +1,34 @@
+package com.ym.mec.web.controller.teacher;
+
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.QueryInfo;
+import com.ym.mec.web.dal.entity.TeacherDefaultMusicGroupSalary;
+import com.ym.mec.web.service.TeacherDefaultMusicGroupSalaryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RequestMapping("teacherDefaultMusicGroupSalary")
+@Api(tags = "教师薪酬服务")
+@RestController
+public class TeacherDefaultMusicGroupSalaryController extends BaseController {
+
+    @Autowired
+    private TeacherDefaultMusicGroupSalaryService teacherDefaultMusicGroupSalaryService;
+
+    @ApiOperation(value = "批量新增、修改、删除教师乐团课薪酬")
+    @PostMapping("/batchUpset")
+    public Object batchUpset(@RequestBody List<TeacherDefaultMusicGroupSalary> teacherDefaultMusicGroupSalaries) {
+        teacherDefaultMusicGroupSalaryService.batchUpset(teacherDefaultMusicGroupSalaries);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询教师薪酬")
+    @GetMapping("/queryPage")
+    public Object queryPage(QueryInfo queryInfo) {
+        return succeed(teacherDefaultMusicGroupSalaryService.queryPage(queryInfo));
+    }
+}

mec-web/src/main/java/com/ym/mec/web/controller/teacher/TeacherLeaveRecordController.java

@@ -0,0 +1,40 @@
+package com.ym.mec.web.controller.teacher;
+
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.QueryInfo;
+import com.ym.mec.web.dal.entity.TeacherLeaveRecord;
+import com.ym.mec.web.service.TeacherLeaveRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RequestMapping("teacherLeaveRecord")
+@Api(tags = "教师请假记录服务")
+@RestController
+public class TeacherLeaveRecordController extends BaseController {
+
+    @Autowired
+    private TeacherLeaveRecordService teacherLeaveRecordService;
+
+    @ApiOperation(value = "新增教师请假记录")
+    @PostMapping("/add")
+    public Object add(TeacherLeaveRecord teacherLeaveRecord){
+        teacherLeaveRecordService.insert(teacherLeaveRecord);
+        return succeed();
+    }
+
+    @ApiOperation(value = "根据教师请假记录编号查询教师请假记录")
+    @GetMapping("/get/{id}")
+    public Object get(@ApiParam(value = "教师请假记录编号", required = true) @PathVariable("id") Long id){
+        return succeed(teacherLeaveRecordService.get(id));
+    }
+
+    @ApiOperation(value = "分页查询教师请假记录列表")
+    @GetMapping("/queryPage")
+    public Object queryPage(QueryInfo queryInfo){
+        return succeed(teacherLeaveRecordService.queryPage(queryInfo));
+    }
+
+}

mec-web/src/main/java/com/ym/mec/web/dal/entity/ClassGroupTeacherMapper.java

@@ -1,7 +1,10 @@
 package com.ym.mec.web.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.math.BigDecimal;
+
 /**
  * 对应数据库表(class_group_teacher_mapper):
  */
@@ -11,19 +14,24 @@ public class ClassGroupTeacherMapper {
 	private Long id;
 	
 	/**  */
+	@ApiModelProperty(value = "乐团编号",required = false)
 	private Integer musicGroupId;
 	
 	/**  */
+	@ApiModelProperty(value = "班级编号",required = false)
 	private Integer classGroupId;
 	
 	/** 老师角色（主教、助教） */
+	@ApiModelProperty(value = "老师角色",required = false)
 	private String teacherRole;
 	
 	/**  */
+	@ApiModelProperty(value = "用户编号",required = false)
 	private Integer userId;
 	
 	/** 薪酬 */
-	private long salary;
+	@ApiModelProperty(value = "薪酬",required = false)
+	private BigDecimal salary;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -70,15 +78,15 @@ public class ClassGroupTeacherMapper {
 	public Integer getUserId(){
 		return this.userId;
 	}
-			
-	public void setSalary(long salary){
-		this.salary = salary;
+
+	public BigDecimal getSalary() {
+		return salary;
 	}
-	
-	public long getSalary(){
-		return this.salary;
+
+	public void setSalary(BigDecimal salary) {
+		this.salary = salary;
 	}
-			
+
 	public void setCreateTime(java.util.Date createTime){
 		this.createTime = createTime;
 	}

mec-web/src/main/java/com/ym/mec/web/dal/entity/TeacherDefaultMusicGroupSalary.java

@@ -1,7 +1,12 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.ClassGroupTypeEnum;
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.math.BigDecimal;
+
 /**
  * 对应数据库表(teacher_default_music_group_salary):
  */
@@ -11,26 +16,42 @@ public class TeacherDefaultMusicGroupSalary {
 	private Long id;
 	
 	/**  */
+	@ApiModelProperty(value = "教师编号",required = false)
 	private Integer userId;
 	
 	/** 班级类型（参照 class_group表的type_字段） */
-	private String classGroupType;
+	@ApiModelProperty(value = "班级类型",required = false)
+	private ClassGroupTypeEnum classGroupType;
 	
 	/**  */
+	@ApiModelProperty(value = "专业技能",required = false)
 	private Integer subjectId;
 	
 	/** 主教薪酬 */
-	private long mainTeacherSalary;
+	@ApiModelProperty(value = "主教薪酬",required = false)
+	private BigDecimal mainTeacherSalary;
 	
 	/** 助教薪酬 */
-	private long assistantTeacherSalary;
+	@ApiModelProperty(value = "助教薪酬",required = false)
+	private BigDecimal assistantTeacherSalary;
+
+	@ApiModelProperty(value = "是否删除该条数据",required = false)
+	private YesOrNoEnum delFlag;
 	
 	/**  */
 	private java.util.Date createTime;
 	
 	/**  */
 	private java.util.Date updateTime;
-	
+
+	public YesOrNoEnum getDelFlag() {
+		return delFlag;
+	}
+
+	public void setDelFlag(YesOrNoEnum delFlag) {
+		this.delFlag = delFlag;
+	}
+
 	public void setId(Long id){
 		this.id = id;
 	}
@@ -46,15 +67,15 @@ public class TeacherDefaultMusicGroupSalary {
 	public Integer getUserId(){
 		return this.userId;
 	}
-			
-	public void setClassGroupType(String classGroupType){
-		this.classGroupType = classGroupType;
+
+	public ClassGroupTypeEnum getClassGroupType() {
+		return classGroupType;
 	}
-	
-	public String getClassGroupType(){
-		return this.classGroupType;
+
+	public void setClassGroupType(ClassGroupTypeEnum classGroupType) {
+		this.classGroupType = classGroupType;
 	}
-			
+
 	public void setSubjectId(Integer subjectId){
 		this.subjectId = subjectId;
 	}
@@ -62,23 +83,23 @@ public class TeacherDefaultMusicGroupSalary {
 	public Integer getSubjectId(){
 		return this.subjectId;
 	}
-			
-	public void setMainTeacherSalary(long mainTeacherSalary){
+
+	public BigDecimal getMainTeacherSalary() {
+		return mainTeacherSalary;
+	}
+
+	public void setMainTeacherSalary(BigDecimal mainTeacherSalary) {
 		this.mainTeacherSalary = mainTeacherSalary;
 	}
-	
-	public long getMainTeacherSalary(){
-		return this.mainTeacherSalary;
+
+	public BigDecimal getAssistantTeacherSalary() {
+		return assistantTeacherSalary;
 	}
-			
-	public void setAssistantTeacherSalary(long assistantTeacherSalary){
+
+	public void setAssistantTeacherSalary(BigDecimal assistantTeacherSalary) {
 		this.assistantTeacherSalary = assistantTeacherSalary;
 	}
-	
-	public long getAssistantTeacherSalary(){
-		return this.assistantTeacherSalary;
-	}
-			
+
 	public void setCreateTime(java.util.Date createTime){
 		this.createTime = createTime;
 	}

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.AuditStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -24,8 +25,8 @@ public class TeacherLeaveRecord {
 	private String type;
 	
 	/** 请假状态（审批中、拒绝、通过） */
-	@ApiModelProperty(value = "请假状态",required = false)
-	private String status;
+	@ApiModelProperty(value = "请假审核状态",required = false)
+	private AuditStatusEnum status;
 	
 	/** 备注 */
 	@ApiModelProperty(value = "备注",required = false)
@@ -68,15 +69,15 @@ public class TeacherLeaveRecord {
 	public String getType(){
 		return this.type;
 	}
-			
-	public void setStatus(String status){
-		this.status = status;
+
+	public AuditStatusEnum getStatus() {
+		return status;
 	}
-	
-	public String getStatus(){
-		return this.status;
+
+	public void setStatus(AuditStatusEnum status) {
+		this.status = status;
 	}
-			
+
 	public void setRemark(String remark){
 		this.remark = remark;
 	}

mec-web/src/main/java/com/ym/mec/web/dal/enums/AuditStatusEnum.java

@@ -0,0 +1,36 @@
+package com.ym.mec.web.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+/**
+ * 审核状态枚举（审批中、拒绝、通过）
+ */
+public enum AuditStatusEnum implements BaseEnum<String, AuditStatusEnum> {
+	ING("ING", "审核中"), REJECT("REJECT", "拒绝"), PASS("PASS", "通过");
+
+	private String code;
+
+	private String msg;
+
+	AuditStatusEnum(String code, String msg) {
+		this.code = code;
+		this.msg = msg;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	@Override
+	public String getCode() {
+		return this.code;
+	}
+}

mec-web/src/main/java/com/ym/mec/web/dal/page/TeacherAttendanceQueryInfo.java

@@ -1,6 +1,7 @@
 package com.ym.mec.web.dal.page;
 
 import com.ym.mec.common.page.QueryInfo;
+import com.ym.mec.web.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -18,6 +19,28 @@ public class TeacherAttendanceQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "签到状态")
     private YesOrNoEnum attendanceStatus;
 
+    @ApiModelProperty(value = "班级类型")
+    private ClassGroupTypeEnum classGroupType;
+
+    @ApiModelProperty(value = "班级名称")
+    private String classGroupName;
+
+    public ClassGroupTypeEnum getClassGroupType() {
+        return classGroupType;
+    }
+
+    public void setClassGroupType(ClassGroupTypeEnum classGroupType) {
+        this.classGroupType = classGroupType;
+    }
+
+    public String getClassGroupName() {
+        return classGroupName;
+    }
+
+    public void setClassGroupName(String classGroupName) {
+        this.classGroupName = classGroupName;
+    }
+
     public Long getTeacherId() {
         return teacherId;
     }

mec-web/src/main/java/com/ym/mec/web/service/TeacherDefaultMusicGroupSalaryService.java

@@ -4,6 +4,8 @@ import com.ym.mec.common.service.BaseService;
 import com.ym.mec.web.dal.entity.TeacherDefaultMusicGroupSalary;
 import com.ym.mec.web.dal.enums.ClassGroupTypeEnum;
 
+import java.util.List;
+
 public interface TeacherDefaultMusicGroupSalaryService extends BaseService<Long, TeacherDefaultMusicGroupSalary> {
 
 
@@ -14,4 +16,10 @@ public interface TeacherDefaultMusicGroupSalaryService extends BaseService<Long,
      * @return
      */
     TeacherDefaultMusicGroupSalary getTeacherSalaryByUserIdAndType(int userId,ClassGroupTypeEnum classGroupType);
+
+    /**
+     * 批量新增修改教师薪酬设置
+     * @param teacherDefaultMusicGroupSalaries
+     */
+    void batchUpset(List<TeacherDefaultMusicGroupSalary> teacherDefaultMusicGroupSalaries);
 }

mec-web/src/main/java/com/ym/mec/web/service/impl/TeacherDefaultMusicGroupSalaryServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ym.mec.web.service.impl;
 
 import com.ym.mec.web.dal.enums.ClassGroupTypeEnum;
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -10,6 +11,9 @@ import com.ym.mec.web.dal.dao.TeacherDefaultMusicGroupSalaryDao;
 import com.ym.mec.web.dal.entity.TeacherDefaultMusicGroupSalary;
 import com.ym.mec.web.service.TeacherDefaultMusicGroupSalaryService;
 
+import java.util.Date;
+import java.util.List;
+
 @Service
 public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<Long, TeacherDefaultMusicGroupSalary>  implements TeacherDefaultMusicGroupSalaryService {
 	
@@ -25,4 +29,23 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
     public TeacherDefaultMusicGroupSalary getTeacherSalaryByUserIdAndType(int userId,ClassGroupTypeEnum classGroupType) {
         return teacherDefaultMusicGroupSalaryDao.getTeacherSalaryByUserIdAndType(userId, classGroupType);
     }
+
+	@Override
+	public void batchUpset(List<TeacherDefaultMusicGroupSalary> teacherDefaultMusicGroupSalaries) {
+		if(teacherDefaultMusicGroupSalaries != null && teacherDefaultMusicGroupSalaries.size() > 0){
+			Date date = new Date();
+			teacherDefaultMusicGroupSalaries.forEach(e->{
+				if(e.getId() == null){
+					teacherDefaultMusicGroupSalaryDao.insert(e);
+				}else{
+					if(e.getDelFlag() == YesOrNoEnum.YES){
+						teacherDefaultMusicGroupSalaryDao.delete(e.getId());
+					}else {
+						e.setUpdateTime(date);
+						teacherDefaultMusicGroupSalaryDao.update(e);
+					}
+				}
+			});
+		}
+	}
 }

mec-web/src/main/resources/config/mybatis/TeacherAttendanceMapper.xml

@@ -101,13 +101,19 @@
                 and ta.teacher_id_ = #{teacherId}
             </if>
             <if test="musicGroupId != null">
-                and ta.music_group_id_ #{musicGroupId}
+                and ta.music_group_id_ = #{musicGroupId}
             </if>
             <if test="classGroupId != null">
-                and ta.class_group_id_ like #{classGroupId}
+                and ta.class_group_id_ = #{classGroupId}
             </if>
             <if test="attendanceStatus != null">
-                and ta.status_ like #{attendanceStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+                and ta.status_ = #{attendanceStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+            </if>
+            <if test="classGroupType != null">
+                and cg.type_ = #{classGroupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+            </if>
+            <if test="classGroupName != null">
+                and cg.name_ like CONCAT('%',#{classGroupName},'%')
             </if>
         </where>
     </sql>

mec-web/src/main/resources/config/mybatis/TeacherDefaultMusicGroupSalaryMapper.xml

@@ -34,7 +34,7 @@
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO teacher_default_music_group_salary
 		(id_,user_id_,class_group_type_,subject_id_,main_teacher_salary_,assistant_teacher_salary_,create_time_,update_time_)
-		VALUES(#{id},#{userId},#{classGroupType},#{subjectId},#{mainTeacherSalary},#{assistantTeacherSalary},#{createTime},#{updateTime})
+		VALUES(#{id},#{userId},#{classGroupType},#{subjectId},#{mainTeacherSalary},#{assistantTeacherSalary},now(),now())
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -48,9 +48,6 @@
 			<if test="userId != null">
 				user_id_ = #{userId},
 			</if>
-			<if test="id != null">
-				id_ = #{id},
-			</if>
 			<if test="updateTime != null">
 				update_time_ = #{updateTime},
 			</if>
@@ -63,9 +60,6 @@
 			<if test="assistantTeacherSalary != null">
 				assistant_teacher_salary_ = #{assistantTeacherSalary},
 			</if>
-			<if test="createTime != null">
-				create_time_ = #{createTime},
-			</if>
 		</set>
 		WHERE id_ = #{id}
 	</update>

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

@@ -5,80 +5,79 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.TeacherLeaveRecordDao">
-	
-	<resultMap type="com.ym.mec.web.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="status_" property="status" />
-		<result column="remark_" property="remark" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="TeacherLeaveRecord" >
+
+    <resultMap type="com.ym.mec.web.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="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="remark_" property="remark"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="TeacherLeaveRecord">
 		SELECT * FROM teacher_leave_record WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="TeacherLeaveRecord">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="TeacherLeaveRecord">
 		SELECT * FROM teacher_leave_record ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.TeacherLeaveRecord" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<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_) VALUES(#{id},#{userId},#{days},#{type},#{status},#{remark},#{createTime},#{updateTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.TeacherLeaveRecord">
-		UPDATE teacher_leave_record <set>
-<if test="status != null">
-status_ = #{status},
-</if>
-<if test="userId != null">
-user_id_ = #{userId},
-</if>
-<if test="remark != null">
-remark_ = #{remark},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="days != null">
-days_ = #{days},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="type != null">
-type_ = #{type},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.TeacherLeaveRecord" useGeneratedKeys="true"
+            keyColumn="id" keyProperty="id">
+        <!--
+        <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_)
+        VALUES(#{id},#{userId},#{days},#{type},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{remark},now(),now())
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.TeacherLeaveRecord">
+        UPDATE teacher_leave_record
+        <set>
+            <if test="status != null">
+                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="userId != null">
+                user_id_ = #{userId},
+            </if>
+            <if test="remark != null">
+                remark_ = #{remark},
+            </if>
+            <if test="days != null">
+                days_ = #{days},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="type != null">
+                type_ = #{type},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM teacher_leave_record WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="TeacherLeaveRecord" parameterType="map">
-		SELECT * FROM teacher_leave_record ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="TeacherLeaveRecord" parameterType="map">
+        SELECT * FROM teacher_leave_record ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM teacher_leave_record
 	</select>
 </mapper>