Merge branch 'saas_zouxuan_04_21_homework' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -33,7 +33,16 @@ public class ExtracurricularExercisesMessage extends BaseEntity {
 
 	private ImSendTypeEnum msgType = ImSendTypeEnum.TXT;
 
-	private Integer musicScoreId;
+	//达标
+	private Integer standardFlag;
+
+	public Integer getStandardFlag() {
+		return standardFlag;
+	}
+
+	public void setStandardFlag(Integer standardFlag) {
+		this.standardFlag = standardFlag;
+	}
 
 	public ImSendTypeEnum getMsgType() {
 		return msgType;

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

@@ -67,6 +67,17 @@ public class ExtracurricularExercisesReply extends BaseEntity {
 	@ApiModelProperty(value="伴奏详情包含，曲目编号、分谱")
 	private String musicScoreContent;
 
+	@ApiModelProperty(value = "0未达标、1达标、2优秀",required = true)
+	private Integer standardFlag;
+
+	public Integer getStandardFlag() {
+		return standardFlag;
+	}
+
+	public void setStandardFlag(Integer standardFlag) {
+		this.standardFlag = standardFlag;
+	}
+
 	public String getMusicScoreContent() {
 		return musicScoreContent;
 	}

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

@@ -72,6 +72,17 @@ public class StudentCourseHomework extends BaseEntity {
 	@ApiModelProperty(value="伴奏名称")
 	private String musicScoreName;
 
+	@ApiModelProperty(value = "0未达标、1达标、2优秀",required = true)
+	private Integer standardFlag;
+
+	public Integer getStandardFlag() {
+		return standardFlag;
+	}
+
+	public void setStandardFlag(Integer standardFlag) {
+		this.standardFlag = standardFlag;
+	}
+
 	public String getMusicScoreContent() {
 		return musicScoreContent;
 	}

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

@@ -39,6 +39,17 @@ public class StudentCourseHomeworkReply extends BaseEntity {
 	//false  文本，true其他需要跳转
 	private ImSendTypeEnum msgType = ImSendTypeEnum.TXT;
 
+	@ApiModelProperty(value = "0未达标、1达标、2优秀",required = true)
+	private Integer standardFlag;
+
+	public Integer getStandardFlag() {
+		return standardFlag;
+	}
+
+	public void setStandardFlag(Integer standardFlag) {
+		this.standardFlag = standardFlag;
+	}
+
 	public ImSendTypeEnum getMsgType() {
 		return msgType;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExtracurricularExercisesMessageServiceImpl.java

@@ -65,6 +65,10 @@ public class ExtracurricularExercisesMessageServiceImpl extends BaseServiceImpl<
 		if(Objects.isNull(extracurricularExercisesReply)){
 			throw new BizException("课外训练不存在");
 		}
+		if(extracurricularExercisesMessage.getStandardFlag() != null && extracurricularExercisesReply.getStandardFlag() == null){
+			extracurricularExercisesReply.setStandardFlag(extracurricularExercisesMessage.getStandardFlag());
+			extracurricularExercisesReplyDao.update(extracurricularExercisesReply);
+		}
 		ExtracurricularExercises extracurricularExercises = extracurricularExercisesDao.get(extracurricularExercisesReply.getExtracurricularExercisesId());
 		if("TEACHER".equals(extracurricularExercisesMessage.getRole())){
 			if(Objects.nonNull(extracurricularExercisesReply.getAttachments())){

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentCourseHomeworkReplyServiceImpl.java

@@ -83,6 +83,10 @@ public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long,
 		if(Objects.isNull(studentCourseHomework)){
 			throw new BizException("请指定需要回复的作业");
 		}
+		if(bean.getStandardFlag() != null && studentCourseHomework.getStandardFlag() == null){
+			studentCourseHomework.setStandardFlag(bean.getStandardFlag());
+			studentCourseHomeworkService.update(studentCourseHomework);
+		}
 		if(Objects.nonNull(studentCourseHomework.getAttachments())){
 			studentCourseHomeworkService.updateReplyStatus(bean.getUserId(),
 					studentCourseHomework.getCourseHomeworkId(),

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

@@ -25,6 +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" />
 		<association property="extracurricularExercises" columnPrefix="ee_" resultMap="com.ym.mec.biz.dal.dao.ExtracurricularExercisesDao.ExtracurricularExercises"/>
 	</resultMap>
 
@@ -93,20 +94,21 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO extracurricular_exercises_reply (extracurricular_exercises_id_,user_id_,attachments_,create_time_,
-		                                             update_time_,remark_,status_,is_replied_,is_view_,is_replied_timely_,music_score_id_,music_score_content_,tenant_id_)
+		                                             update_time_,remark_,status_,is_replied_,is_view_,is_replied_timely_,
+		                                             music_score_id_,music_score_content_,tenant_id_,standard_flag_)
 		VALUES(#{extracurricularExercisesId},#{userId},#{attachments},NOW(),NOW(),#{remark},#{status},#{isReplied},#{isView},
-		       #{isRepliedTimely},#{musicScoreId},#{musicScoreContent},#{tenantId})
+		       #{isRepliedTimely},#{musicScoreId},#{musicScoreContent},#{tenantId},#{standardFlag})
 	</insert>
 
 	<insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO extracurricular_exercises_reply (extracurricular_exercises_id_,user_id_,attachments_,
 		                                             create_time_,update_time_,remark_,status_,is_replied_,is_view_,
-		                                             is_replied_timely_,music_score_id_,music_score_content_,tenant_id_)
+		                                             is_replied_timely_,music_score_id_,music_score_content_,tenant_id_,standard_flag_)
 		VALUES
 		<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})
+			 #{reply.musicScoreId},#{reply.musicScoreContent},#{replay.tenantId},#{replay.standardFlag})
 		</foreach>
 	</insert>
 
@@ -114,6 +116,9 @@
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply">
 		UPDATE extracurricular_exercises_reply
 		<set>
+			<if test="standardFlag != null">
+				standard_flag_ = #{standardFlag},
+			</if>
 			<if test="musicScoreId != null">
 				music_score_id_ = #{musicScoreId},
 			</if>

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

@@ -28,6 +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"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.dto.CourseHomeworkStudentDetailDto" id="CourseHomeworkStudentDetailDto">
@@ -73,24 +74,24 @@
             keyColumn="id" keyProperty="id">
         INSERT INTO student_course_homework
         (user_id_,course_schedule_id_,course_homework_id_,attachments_,score_,create_time_,update_time_,
-         remark_,status_,is_replied_,is_view_,is_replied_timely_,music_score_id_,music_score_content_,tenant_id_)
+         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})
+               #{isView,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{isRepliedTimely},#{musicScoreId},#{musicScoreContent},#{tenantId},#{standardFlag})
     </insert>
 
     <insert id="batchInsertStudentCourseHomeworkRecord" parameterType="java.util.List" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
         INSERT INTO student_course_homework
         (user_id_,course_schedule_id_,course_homework_id_,attachments_,score_,create_time_,
-         update_time_,remark_,status_,is_replied_,is_view_,is_replied_timely_,music_score_id_,music_score_content_,tenant_id_)
+         update_time_,remark_,status_,is_replied_,is_view_,is_replied_timely_,music_score_id_,music_score_content_,tenant_id_,standard_flag_)
         VALUE
         <foreach collection="list" item="homework" separator=",">
             (#{homework.userId},#{homework.courseScheduleId},#{homework.courseHomeworkId},#{homework.attachments},
             #{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.musicScoreId},#{homework.musicScoreContent},#{homework.tenantId},#{homework.standardFlag})
         </foreach>
     </insert>
 
@@ -98,6 +99,9 @@
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.StudentCourseHomework">
         UPDATE student_course_homework
         <set>
+            <if test="standardFlag != null">
+                standard_flag_ = #{standardFlag},
+            </if>
             <if test="musicScoreId != null">
                 music_score_id_ = #{musicScoreId},
             </if>

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

@@ -68,6 +68,7 @@ public class TeacherCourseHomeworkReplyController extends BaseController {
             extracurricularExercisesMessage.setMsgType(studentCourseHomeworkReply.getMsgType());
             extracurricularExercisesMessage.setUserId(user.getId());
             extracurricularExercisesMessage.setRole("TEACHER");
+            extracurricularExercisesMessage.setStandardFlag(studentCourseHomeworkReply.getStandardFlag());
             extracurricularExercisesMessageService.addStudentExtraExerciseComment(extracurricularExercisesMessage);
         }
         return succeed();