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

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

@@ -25,6 +25,7 @@ import com.ym.mec.util.date.DateUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.CollectionUtils;
@@ -1697,7 +1698,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
     public Map practiceApply2(PracticeGroup practiceGroup) {
         if(Objects.isNull(practiceGroup.getUserId())){
             throw new BizException("请选择老师");

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

@@ -2183,7 +2183,7 @@
         WHERE cs.group_type_='PRACTICE'
           AND cssp.user_id_=#{userId}
     </select>
-    <select id="findTeacherCoursesWithIncludeDateRange" resultMap="CourseSchedule">
+    <select id="findTeacherCoursesWithIncludeDateRange" resultMap="CourseSchedule" useCache="false" flushCache="true">
         SELECT
             cs.id_,
             cs.class_group_id_,

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

@@ -23,7 +23,7 @@
 		SELECT * FROM student
 	</select>
 
-	<select id="lockUser" resultType="int">
+	<select id="lockUser" resultType="int" useCache="false" flushCache="true">
 		SELECT id_ FROM sys_user WHERE id_=#{userId} FOR UPDATE
 	</select>