作业新增快速回复

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

@@ -68,13 +68,13 @@ public class ExtracurricularExercisesReply extends BaseEntity {
 	private String musicScoreContent;
 
 	@ApiModelProperty(value = "0未达标、1达标、2优秀",required = true)
-	private int standardFlag;
+	private Integer standardFlag;
 
-	public int getStandardFlag() {
+	public Integer getStandardFlag() {
 		return standardFlag;
 	}
 
-	public void setStandardFlag(int standardFlag) {
+	public void setStandardFlag(Integer standardFlag) {
 		this.standardFlag = standardFlag;
 	}
 

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

@@ -73,13 +73,13 @@ public class StudentCourseHomework extends BaseEntity {
 	private String musicScoreName;
 
 	@ApiModelProperty(value = "0未达标、1达标、2优秀",required = true)
-	private int standardFlag;
+	private Integer standardFlag;
 
-	public int getStandardFlag() {
+	public Integer getStandardFlag() {
 		return standardFlag;
 	}
 
-	public void setStandardFlag(int standardFlag) {
+	public void setStandardFlag(Integer standardFlag) {
 		this.standardFlag = standardFlag;
 	}
 

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

@@ -40,13 +40,13 @@ public class StudentCourseHomeworkReply extends BaseEntity {
 	private ImSendTypeEnum msgType = ImSendTypeEnum.TXT;
 
 	@ApiModelProperty(value = "0未达标、1达标、2优秀",required = true)
-	private int standardFlag;
+	private Integer standardFlag;
 
-	public int getStandardFlag() {
+	public Integer getStandardFlag() {
 		return standardFlag;
 	}
 
-	public void setStandardFlag(int standardFlag) {
+	public void setStandardFlag(Integer standardFlag) {
 		this.standardFlag = standardFlag;
 	}
 

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

@@ -116,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-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();