update

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

@@ -305,7 +305,7 @@
     <!-- 根据乐团和声部获取未分班的学生 -->
     <select id="getNoClassStuBySubjectId" resultMap="StudentRegistration">
         SELECT * FROM student_registration
-        WHERE music_group_id_ = #{musicGroupId} AND payment_status_ = 2 AND class_group_id_=0
+        WHERE music_group_id_ = #{musicGroupId} AND payment_status_ = 2 AND (class_group_id_= 0 OR class_group_id_ IS NULL)
         AND music_group_status_ != 'QUIT'
         <if test="actualSubjectId != null">
             AND FIND_IN_SET(actual_subject_id_,#{actualSubjectId})
@@ -319,7 +319,7 @@
     <!-- 根据乐团和声部获取未分班人数 -->
     <select id="getNoClassStuCountByMusicGroupId" resultMap="getNoClassStuCountByMusicGroupId">
         SELECT actual_subject_id_ ,COUNT(*) nums FROM student_registration
-        WHERE music_group_id_ = #{musicGroupId} AND payment_status_=2 AND class_group_id_=0
+        WHERE music_group_id_ = #{musicGroupId} AND payment_status_=2 AND (class_group_id_= 0 OR class_group_id_ IS NULL)
         AND music_group_status_ != 'QUIT'
         GROUP BY actual_subject_id_;
     </select>
@@ -401,7 +401,7 @@
         <if test="actualSubjectId != null">
             AND actual_subject_id_ = #{actualSubjectId}
         </if>
-        AND payment_status_ = 2 AND class_group_id_ =0 AND music_group_status_ != 'QUIT'
+        AND payment_status_ = 2 AND (class_group_id_= 0 OR class_group_id_ IS NULL) AND music_group_status_ != 'QUIT'
     </select>
 
 

mec-common/common-core/src/main/java/com/ym/mec/common/service/impl/RedisIdGeneratorService.java

@@ -7,6 +7,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;