浏览代码

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

zouxuan 5 年之前
父节点
当前提交
28c6fbe7c7

+ 73 - 50
mec-web/src/main/java/com/ym/mec/web/dal/entity/CourseSchedule.java

@@ -1,9 +1,12 @@
 package com.ym.mec.web.dal.entity;
 
-import com.ym.mec.web.dal.enums.CourseStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.web.dal.enums.CourseStatusEnum;
+import com.ym.mec.web.dal.enums.TeachModeEnum;
+
 /**
  * 对应数据库表(course_schedule):
  */
@@ -11,58 +14,62 @@ public class CourseSchedule {
 
 	/**  */
 	private Long id;
-	
+
 	/** 班级编号 */
-	@ApiModelProperty(value = "班级编号",required = false)
+	@ApiModelProperty(value = "班级编号", required = false)
 	private Integer classGroupId;
-	
+
 	/** 课程状态 */
-	@ApiModelProperty(value = "课程状态  NOT_START未开始,SIGN_IN已签到,SIGN_OUT已签退",required = false)
+	@ApiModelProperty(value = "课程状态  NOT_START未开始,SIGN_IN已签到,SIGN_OUT已签退", required = false)
 	private CourseStatusEnum status;
-	
+
 	/** 补贴 */
-	@ApiModelProperty(value = "补贴",required = false)
+	@ApiModelProperty(value = "补贴", required = false)
 	private long subsidy;
-	
+
 	/** 上课日期 */
-	@ApiModelProperty(value = "上课日期",required = false)
+	@ApiModelProperty(value = "上课日期", required = false)
 	private java.util.Date classDate;
-	
+
 	/** 上课时间 */
-	@ApiModelProperty(value = "上课时间",required = false)
+	@ApiModelProperty(value = "上课时间", required = false)
 	private java.util.Date startClassTime;
-	
+
 	/** 结束时间 */
-	@ApiModelProperty(value = "结束时间",required = false)
+	@ApiModelProperty(value = "结束时间", required = false)
 	private java.util.Date endClassTime;
-	
+
 	/** 上课教师 */
-	@ApiModelProperty(value = "上课教师",required = false)
+	@ApiModelProperty(value = "上课教师", required = false)
 	private Long teacherId;
-	
+
 	/** 实际上课教师 */
-	@ApiModelProperty(value = "实际上课教师",required = false)
+	@ApiModelProperty(value = "实际上课教师", required = false)
 	private Long actualTeacherId;
-	
+
 	/**  */
 	private java.util.Date createTime;
-	
+
 	/**  */
 	private java.util.Date updateTime;
-	
-	public void setId(Long id){
+
+	private TeachModeEnum teachMode;
+
+	private boolean complaintStatus;
+
+	public void setId(Long id) {
 		this.id = id;
 	}
-	
-	public Long getId(){
+
+	public Long getId() {
 		return this.id;
 	}
-			
-	public void setClassGroupId(Integer classGroupId){
+
+	public void setClassGroupId(Integer classGroupId) {
 		this.classGroupId = classGroupId;
 	}
-	
-	public Integer getClassGroupId(){
+
+	public Integer getClassGroupId() {
 		return this.classGroupId;
 	}
 
@@ -74,35 +81,35 @@ public class CourseSchedule {
 		this.status = status;
 	}
 
-	public void setSubsidy(long subsidy){
+	public void setSubsidy(long subsidy) {
 		this.subsidy = subsidy;
 	}
-	
-	public long getSubsidy(){
+
+	public long getSubsidy() {
 		return this.subsidy;
 	}
-			
-	public void setClassDate(java.util.Date classDate){
+
+	public void setClassDate(java.util.Date classDate) {
 		this.classDate = classDate;
 	}
-	
-	public java.util.Date getClassDate(){
+
+	public java.util.Date getClassDate() {
 		return this.classDate;
 	}
-			
-	public void setStartClassTime(java.util.Date startClassTime){
+
+	public void setStartClassTime(java.util.Date startClassTime) {
 		this.startClassTime = startClassTime;
 	}
-	
-	public java.util.Date getStartClassTime(){
+
+	public java.util.Date getStartClassTime() {
 		return this.startClassTime;
 	}
-			
-	public void setEndClassTime(java.util.Date endClassTime){
+
+	public void setEndClassTime(java.util.Date endClassTime) {
 		this.endClassTime = endClassTime;
 	}
-	
-	public java.util.Date getEndClassTime(){
+
+	public java.util.Date getEndClassTime() {
 		return this.endClassTime;
 	}
 
@@ -122,22 +129,38 @@ public class CourseSchedule {
 		this.actualTeacherId = actualTeacherId;
 	}
 
-	public void setCreateTime(java.util.Date createTime){
+	public void setCreateTime(java.util.Date createTime) {
 		this.createTime = createTime;
 	}
-	
-	public java.util.Date getCreateTime(){
+
+	public java.util.Date getCreateTime() {
 		return this.createTime;
 	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
+
+	public void setUpdateTime(java.util.Date updateTime) {
 		this.updateTime = updateTime;
 	}
-	
-	public java.util.Date getUpdateTime(){
+
+	public java.util.Date getUpdateTime() {
 		return this.updateTime;
 	}
-			
+
+	public TeachModeEnum getTeachMode() {
+		return teachMode;
+	}
+
+	public void setTeachMode(TeachModeEnum teachMode) {
+		this.teachMode = teachMode;
+	}
+
+	public boolean isComplaintStatus() {
+		return complaintStatus;
+	}
+
+	public void setComplaintStatus(boolean complaintStatus) {
+		this.complaintStatus = complaintStatus;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

+ 33 - 0
mec-web/src/main/java/com/ym/mec/web/dal/enums/TeachModeEnum.java

@@ -0,0 +1,33 @@
+package com.ym.mec.web.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+public enum TeachModeEnum implements BaseEnum<String, TeachModeEnum> {
+	ONLINE("ONLINE", "线上"), OFFLINE("OFFLINE", "线下");
+
+	private String code;
+
+	private String msg;
+
+	TeachModeEnum(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;
+	}
+}

+ 14 - 4
mec-web/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -18,6 +18,8 @@
         <result column="actual_teacher_id_" property="actualTeacherId"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="teach_mode_" property="teachMode" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="complaint_status_" property="complaintStatus"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.web.dal.dto.CourseScheduleDto" id="courseScheduleDto">
@@ -32,6 +34,8 @@
         <result column="actual_teacher_id_" property="actualTeacherId"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="teach_mode_" property="teachMode" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="complaint_status_" property="complaintStatus"/>
         <result column="name_" property="classGroupName"/>
         <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
@@ -55,16 +59,16 @@
         </selectKey>
         -->
         INSERT INTO course_schedule
-        (id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_)
-        VALUES(#{id},#{classGroupId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subsidy},#{classDate},#{startClassTime},#{endClassTime},#{teacherId},#{actualTeacherId},now(),now())
+        (id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_,teach_mode_,complaint_status_)
+        VALUES(#{id},#{classGroupId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subsidy},#{classDate},#{startClassTime},#{endClassTime},#{teacherId},#{actualTeacherId},now(),now(),#{teachMode,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{complaintStatus})
     </insert>
 
     <insert id="batchAddCourseSchedules" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id_">
         INSERT INTO course_schedule
-        (id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_)
+        (id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_,teach_mode_,complaint_status_)
         VALUE
         <foreach collection="list" item="course" separator=",">
-            (#{course.id},#{course.classGroupId},#{course.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.subsidy},#{course.classDate},#{course.startClassTime},#{course.endClassTime},#{course.teacherId},#{course.actualTeacherId},now(),now())
+            (#{course.id},#{course.classGroupId},#{course.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.subsidy},#{course.classDate},#{course.startClassTime},#{course.endClassTime},#{course.teacherId},#{course.actualTeacherId},now(),now(),#{course.teachMode,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.complaintStatus})
         </foreach>
     </insert>
 
@@ -99,6 +103,12 @@
             <if test="updateTime != null">
                 update_time_ = #{updateTime},
             </if>
+            <if test="teachMode != null">
+                teach_mode_ = #{teachMode,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="complaintStatus != null">
+                complaint_status_ = #{complaintStatus},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>