Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ExtracurricularExercisesDao.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.ExtracurricularExercises;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -11,4 +12,15 @@ public interface ExtracurricularExercisesDao extends BaseDAO<Long, Extracurricul
     int countExtraExercises(Map<String, Object> params);
     List<ExtracurricularExercises> findExtraExercises(Map<String, Object> params);
 
+    /**
+     * 查询同一个老师对同一批学员布置相同作业的最新记录
+     * @param teacherId
+     * @param studentIdList
+     * @param content
+     * @return
+     */
+    ExtracurricularExercises findRepeatLastExercises(@Param("teacherId") Integer teacherId,
+                             @Param("studentIdList") String studentIdList,
+                             @Param("content") String content);
+
 }

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

@@ -60,7 +60,12 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 		}
 		
 		Teacher teacher = teacherDao.getLocked(exercises.getTeacherId());
-		
+
+		ExtracurricularExercises repeatLastExercises = extracurricularExercisesDao.findRepeatLastExercises(exercises.getTeacherId(), exercises.getStudentIdList(), exercises.getContent());
+		if(Objects.nonNull(repeatLastExercises)&&DateUtil.minutesBetween(repeatLastExercises.getCreateTime(),new Date())<60){
+			return;
+		}
+
 		if(Objects.isNull(exercises.getExpireDate())){
 			LocalDateTime localDateTime=LocalDateTime.now();
 			localDateTime=localDateTime.plusDays(2).withHour(21).withMinute(0).withSecond(0);

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

@@ -2649,8 +2649,7 @@
         AND cgtm.`teacher_role_` = 'BISHOP'
         LEFT JOIN `course_schedule` cs ON cs.`class_group_id_` = cg.`id_`
         WHERE
-        cgsm.user_id_=#{studentId}
-        AND cgtm.teacher_role_='BISHOP'
+        cgtm.teacher_role_='BISHOP'
         AND cgsm.status_ = 'NORMAL'
         AND cg.group_type_ IN ( 'PRACTICE', 'MUSIC', 'VIP' )
         AND cs.`id_` IS NOT NULL

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

@@ -149,4 +149,15 @@
 		ORDER BY create_time_ DESC
 		<include refid="global.limit"/>
 	</select>
+    <select id="findRepeatLastExercises" resultMap="ExtracurricularExercises">
+		SELECT
+			*
+		FROM
+			extracurricular_exercises
+		WHERE
+			teacher_id_ = #{teacherId}
+			AND student_id_list_ = #{studentIdList}
+			AND content_ = #{content}
+		ORDER BY create_time_ DESC LIMIT 1
+	</select>
 </mapper>