Merge remote-tracking branch 'origin/master'

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

@@ -3610,6 +3610,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             //获取当前班级剩余课次
             Map<String,Long> subCourseNumMap = MapUtil.convertIntegerMap(courseScheduleDao.querySubCourseNumMap(classGroupId));
             for (String courseType : courseTypes) {
+                groupType.add(courseType);
                 Long currentNum = subCourseNumMap.get(courseType);
                 if(currentNum == null){
                     currentNum = 0l;
@@ -3619,7 +3620,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 if(currentNum >= maxNum){
                     continue;
                 }
-                groupType.add(courseType);
                 Long subNum = maxNum - currentNum;
                 //生成缴费项目
                 MusicGroupOrganizationCourseSettingsDetail settingsDetail = new MusicGroupOrganizationCourseSettingsDetail();
@@ -3831,7 +3831,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 //        JSONObject jsonObject = JSON.parseObject(courseDefaultMinutes);
         //获取所选班级最大剩余课时
         Map<String,Long> map = MapUtil.convertIntegerMap(courseScheduleDao.findClassMaxCourseNumMap(classGroupIds));
-        Set<String> courseTypes = classCourseMinuteMap.keySet();
+        Set<String> courseTypes = map.keySet();
         for (String courseType : courseTypes) {
 //            剩余时长*默认排课时长
             resultMap.put(courseType,classCourseMinuteMap.get(courseType) * map.get(courseType));

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

@@ -28,6 +28,8 @@ 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.transaction.interceptor.TransactionalProxy;
 import org.springframework.util.CollectionUtils;
 
 import java.util.*;
@@ -177,7 +179,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
         Map<String, Object> result = new HashMap<>();
 
         if (!courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.VIP)) {
-            result.put("status",1);
+            result.put("status",0);
             return result;
         }
 
@@ -211,6 +213,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
         if(StringUtils.isEmpty(studentAttendanceInfos.getRemark())&&!isInScore){
             //当前为异常签到，请填写原因!
             result.put("status",2);
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return result;
         }
 

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

@@ -526,7 +526,7 @@
     </select>
     <sql id="queryTeacherAttendanceComplaintsSql">
         <where>
-            cs.actual_teacher_id_ = ta.teacher_id_ AND ta.is_complaints_ = 1
+            ta.is_complaints_ = 1
             <if test="organId != null and organId != ''">
                 AND FIND_IN_SET(t.organ_id_, #{organId})
             </if>