作业新增快速评价

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseHomeworkStudentDetailDto.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.enums.StandardEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
@@ -53,6 +54,9 @@ public class CourseHomeworkStudentDetailDto {
     @ApiModelProperty(value = "是否已经回复",required = false)
     private YesOrNoEnum isReplied;
 
+    @ApiModelProperty(value = "作业评价评级",required = false)
+    private StandardEnum standardFlag;
+
     private Integer studentId;
 
     private String studentName;
@@ -79,6 +83,14 @@ public class CourseHomeworkStudentDetailDto {
     
     private MusicGroupTrainPlan musicGroupTrainPlan;
 
+    public StandardEnum getStandardFlag() {
+        return standardFlag;
+    }
+
+    public void setStandardFlag(StandardEnum standardFlag) {
+        this.standardFlag = standardFlag;
+    }
+
     public String getMusicScoreContent() {
         return musicScoreContent;
     }

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
+import com.ym.mec.biz.dal.enums.StandardEnum;
 import com.ym.mec.common.entity.BaseEntity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -34,13 +35,13 @@ public class ExtracurricularExercisesMessage extends BaseEntity {
 	private ImSendTypeEnum msgType = ImSendTypeEnum.TXT;
 
 	//达标
-	private Integer standardFlag;
+	private StandardEnum standardFlag;
 
-	public Integer getStandardFlag() {
+	public StandardEnum getStandardFlag() {
 		return standardFlag;
 	}
 
-	public void setStandardFlag(Integer standardFlag) {
+	public void setStandardFlag(StandardEnum standardFlag) {
 		this.standardFlag = standardFlag;
 	}
 

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.StandardEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -67,14 +68,14 @@ public class ExtracurricularExercisesReply extends BaseEntity {
 	@ApiModelProperty(value="伴奏详情包含，曲目编号、分谱")
 	private String musicScoreContent;
 
-	@ApiModelProperty(value = "0未达标、1达标、2优秀",required = true)
-	private Integer standardFlag;
+	@ApiModelProperty(value = "作业评级",required = true)
+	private StandardEnum standardFlag;
 
-	public Integer getStandardFlag() {
+	public StandardEnum getStandardFlag() {
 		return standardFlag;
 	}
 
-	public void setStandardFlag(Integer standardFlag) {
+	public void setStandardFlag(StandardEnum standardFlag) {
 		this.standardFlag = standardFlag;
 	}
 

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
+import com.ym.mec.biz.dal.enums.StandardEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.common.entity.BaseEntity;
 
@@ -73,13 +74,13 @@ public class StudentCourseHomework extends BaseEntity {
 	private String musicScoreName;
 
 	@ApiModelProperty(value = "0未达标、1达标、2优秀",required = true)
-	private Integer standardFlag;
+	private StandardEnum standardFlag;
 
-	public Integer getStandardFlag() {
+	public StandardEnum getStandardFlag() {
 		return standardFlag;
 	}
 
-	public void setStandardFlag(Integer standardFlag) {
+	public void setStandardFlag(StandardEnum standardFlag) {
 		this.standardFlag = standardFlag;
 	}
 

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
+import com.ym.mec.biz.dal.enums.StandardEnum;
 import com.ym.mec.common.entity.BaseEntity;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -40,13 +41,13 @@ public class StudentCourseHomeworkReply extends BaseEntity {
 	private ImSendTypeEnum msgType = ImSendTypeEnum.TXT;
 
 	@ApiModelProperty(value = "0未达标、1达标、2优秀",required = true)
-	private Integer standardFlag;
+	private StandardEnum standardFlag;
 
-	public Integer getStandardFlag() {
+	public StandardEnum getStandardFlag() {
 		return standardFlag;
 	}
 
-	public void setStandardFlag(Integer standardFlag) {
+	public void setStandardFlag(StandardEnum standardFlag) {
 		this.standardFlag = standardFlag;
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/StandardEnum.java

@@ -0,0 +1,33 @@
+package com.ym.mec.biz.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+public enum StandardEnum implements BaseEnum<String, StandardEnum> {
+	NOT_STANDARD("NOT_STANDARD", "未达标"), STANDARD("STANDARD", "已达标"), EXCELLENT("EXCELLENT", "优秀");
+
+	private String code;
+
+	private String msg;
+
+	StandardEnum(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-biz/src/main/resources/config/mybatis/ExtracurricularExercisesReplyMapper.xml

@@ -25,7 +25,7 @@
 		<result column="music_score_id_" property="musicScoreId" />
 		<result column="music_score_content_" property="musicScoreContent" />
 		<result column="tenant_id_" property="tenantId" />
-		<result column="standard_flag_" property="standardFlag" />
+		<result column="standard_flag_" property="standardFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<association property="extracurricularExercises" columnPrefix="ee_" resultMap="com.ym.mec.biz.dal.dao.ExtracurricularExercisesDao.ExtracurricularExercises"/>
 	</resultMap>
 
@@ -108,7 +108,7 @@
 		<foreach collection="replies" item="reply" separator=",">
 			(#{reply.extracurricularExercisesId},#{reply.userId},#{reply.attachments},NOW(),NOW(),
 			 #{reply.remark},#{reply.status},#{reply.isReplied},#{reply.isView},#{reply.isRepliedTimely},
-			 #{reply.musicScoreId},#{reply.musicScoreContent},#{replay.tenantId},#{replay.standardFlag})
+			 #{reply.musicScoreId},#{reply.musicScoreContent},#{replay.tenantId},#{replay.standardFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
 		</foreach>
 	</insert>
 
@@ -117,7 +117,7 @@
 		UPDATE extracurricular_exercises_reply
 		<set>
 			<if test="standardFlag != null">
-				standard_flag_ = #{standardFlag},
+				standard_flag_ = #{standardFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 			</if>
 			<if test="musicScoreId != null">
 				music_score_id_ = #{musicScoreId},
@@ -217,6 +217,7 @@
 			ee.teacher_id_,
 			eer.music_score_id_,
 			eer.music_score_content_,
+			eer.standard_flag_,
 			su.username_ student_name_
 		FROM
 			extracurricular_exercises_reply eer

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

@@ -28,7 +28,7 @@
         <result column="music_score_id_" property="musicScoreId"/>
         <result column="music_score_content_" property="musicScoreContent"/>
         <result column="tenant_id_" property="tenantId"/>
-        <result column="standard_flag_" property="standardFlag"/>
+        <result column="standard_flag_" property="standardFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.dto.CourseHomeworkStudentDetailDto" id="CourseHomeworkStudentDetailDto">
@@ -47,6 +47,7 @@
         <result column="music_score_content_" property="musicScoreContent"/>
         <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="is_replied_" property="isReplied" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="standard_flag_" property="standardFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.entity.StudentCourseHomework" id="StudentCourseHomeworkFull"
@@ -77,7 +78,8 @@
          remark_,status_,is_replied_,is_view_,is_replied_timely_,music_score_id_,music_score_content_,tenant_id_,standard_flag_)
         VALUES(#{userId},#{courseScheduleId},#{courseHomeworkId},#{attachments},#{score},now(),now(),#{remark},
                #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{isReplied,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-               #{isView,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{isRepliedTimely},#{musicScoreId},#{musicScoreContent},#{tenantId},#{standardFlag})
+               #{isView,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{isRepliedTimely},
+               #{musicScoreId},#{musicScoreContent},#{tenantId},#{standardFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
     </insert>
 
     <insert id="batchInsertStudentCourseHomeworkRecord" parameterType="java.util.List" useGeneratedKeys="true"
@@ -91,7 +93,8 @@
             #{homework.score},now(),now(),#{homework.remark},#{homework.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{homework.isReplied,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{homework.isView,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{homework.isRepliedTimely},
-            #{homework.musicScoreId},#{homework.musicScoreContent},#{homework.tenantId},#{homework.standardFlag})
+            #{homework.musicScoreId},#{homework.musicScoreContent},#{homework.tenantId},
+            #{homework.standardFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
         </foreach>
     </insert>
 
@@ -100,7 +103,7 @@
         UPDATE student_course_homework
         <set>
             <if test="standardFlag != null">
-                standard_flag_ = #{standardFlag},
+                standard_flag_ = #{standardFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="musicScoreId != null">
                 music_score_id_ = #{musicScoreId},
@@ -242,7 +245,8 @@
                sch.score_,
                sch.status_,
                sch.is_replied_,
-               sch.course_schedule_id_
+               sch.course_schedule_id_,
+               sch.standard_flag_
         FROM course_homework ch
                  LEFT JOIN student_course_homework sch ON ch.id_ = sch.course_homework_id_
                  LEFT JOIN music_group mg ON ch.music_group_id_ = mg.id_