feat: 首页数据变更

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

@@ -21,8 +21,9 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
     int deleteWithMonthAndType(@Param("months") Collection months,
                                @Param("dataType")IndexDataType dataType);
 
-    IndexBaseMonthData getWithDayAndDataType(@Param("day") String day,
-                                             @Param("dataType")IndexDataType dataType);
+    IndexBaseMonthData getOrganDataWithDayAndDataType(@Param("organId") Integer organId,
+                                                      @Param("day") String day,
+                                                      @Param("dataType")IndexDataType dataType);
 
     /**
      * @describe 获取首页统计数据

mec-biz/src/main/java/com/ym/mec/biz/event/listener/GroupEventListener.java

@@ -60,7 +60,7 @@ public class GroupEventListener {
             if(userGroupIdMap.containsKey(studentId)&&userGroupIdMap.get(studentId).size()>1){
                 continue;
             }
-            if(userGroupIdMap.containsKey(userGroupIdMap)&&!userGroupIdMap.get(studentId).contains(musicGroupStatusChangeEvent.getMusicGroupId())){
+            if(userGroupIdMap.containsKey(studentId)&&!userGroupIdMap.get(studentId).contains(musicGroupStatusChangeEvent.getMusicGroupId())){
                 continue;
             }
             updateNum+=1;
@@ -70,10 +70,10 @@ public class GroupEventListener {
         IndexBaseMonthData indexBaseMonthData = null;
         switch (musicGroupStatusChangeEvent.getStudentMusicGroupStatus()){
             case NORMAL:
-                indexBaseMonthData = indexBaseMonthDataDao.getWithDayAndDataType(dayStr, IndexDataType.NEWLY_STUDENT_NUM);
+                indexBaseMonthData = indexBaseMonthDataDao.getOrganDataWithDayAndDataType(musicGroup.getOrganId(), dayStr, IndexDataType.NEWLY_STUDENT_NUM);
                 break;
             case QUIT:
-                indexBaseMonthData = indexBaseMonthDataDao.getWithDayAndDataType(dayStr, IndexDataType.QUIT_MUSIC_GROUP_STUDENT_NUM);
+                indexBaseMonthData = indexBaseMonthDataDao.getOrganDataWithDayAndDataType(musicGroup.getOrganId(), dayStr, IndexDataType.QUIT_MUSIC_GROUP_STUDENT_NUM);
                 break;
             default:
                 return;

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

@@ -28,8 +28,8 @@
 		SELECT * FROM index_base_month_data ORDER BY id_
 	</select>
 
-	<select id="getWithDayAndDataType" resultMap="IndexBaseMonthData">
-		SELECT * FROM index_base_month_data WHERE month_ = #{day} AND data_type_=#{dataType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} ORDER BY month_ DESC LIMIT 1;
+	<select id="getOrganDataWithDayAndDataType" resultMap="IndexBaseMonthData">
+		SELECT * FROM index_base_month_data WHERE organ_id_=#{organId} AND month_ = #{day} AND data_type_=#{dataType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} ORDER BY month_ DESC LIMIT 1;
 	</select>
 
 	<!-- 向数据库增加一条记录 -->