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

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

@@ -14,6 +14,8 @@ import java.util.Map;
 import java.util.Set;
 
 public interface TeacherDao extends BaseDAO<Integer, Teacher> {
+	
+	Teacher getLocked(Integer id);
 
     /**
      * 根据证件号查询老师

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

@@ -58,6 +58,9 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 		if(StringUtils.isBlank(exercises.getStudentIdList())){
 			throw new BizException("请指定学生");
 		}
+		
+		Teacher teacher = teacherDao.getLocked(exercises.getTeacherId());
+		
 		if(Objects.isNull(exercises.getExpireDate())){
 			LocalDateTime localDateTime=LocalDateTime.now();
 			localDateTime=localDateTime.plusDays(2).withHour(21).withMinute(0).withSecond(0);
@@ -68,7 +71,6 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 		exercises.setExpectNum(studentIds.size());
 		extracurricularExercisesDao.insert(exercises);
 		String dateStr = DateUtil.dateToString(exercises.getExpireDate(), "MM月dd日HH点");
-		Teacher teacher = teacherDao.get(exercises.getTeacherId());
 		for (Integer studentId : studentIds) {
 			ExtracurricularExercisesReply studentExtraExercise=new ExtracurricularExercisesReply();
 			studentExtraExercise.setExtracurricularExercisesId(exercises.getId());

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

@@ -76,6 +76,10 @@
         FROM teacher
         ORDER BY id_
     </select>
+    
+    <select id="getLocked" resultMap="Teacher">
+        SELECT * FROM teacher where id_ = #{id} for update
+    </select>
 
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.Teacher" useGeneratedKeys="true" keyColumn="id"