yonge 3 years ago
parent
commit
a2bac8d5ee

+ 2 - 8
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/HfMemberDao.java

@@ -1,10 +1,9 @@
 package com.ym.mec.biz.dal.dao;
 
-import com.ym.mec.biz.dal.entity.HfMember;
-import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
+import com.ym.mec.biz.dal.entity.HfMember;
+import com.ym.mec.common.dal.BaseDAO;
 
 public interface HfMemberDao extends BaseDAO<Integer, HfMember> {
 
@@ -24,9 +23,4 @@ public interface HfMemberDao extends BaseDAO<Integer, HfMember> {
      */
     HfMember getByName(@Param("name") String name);
 
-    /**
-     * 获取分佣账户中需要验证每月收最大金额的账户
-     * @return
-     */
-    List<HfMember> getNeedRouteMerNos();
 }

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

@@ -41,20 +41,20 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
 	List<IndexBaseMonthData> getIndexBaseData(@Param("organIds") Set<Integer> organIds,
                                               @Param("dataTypes") Set<String> dataTypes,
                                               @Param("startMonth") String startMonth,
-                                              @Param("endMonth") String endMonth);
+                                              @Param("endMonth") String endMonth,@Param("tenantId") Integer tenantId);
 
 	List<IndexBaseMonthData> getAllIndexBaseData(@Param("organIds") Set<Integer> organIds,
                                                  @Param("dataTypes") Set<String> dataTypes,
                                                  @Param("startMonth") String startMonth,
-                                                 @Param("endMonth") String endMonth);
+                                                 @Param("endMonth") String endMonth,@Param("tenantId") Integer tenantId);
 
     List<IndexBaseMonthData> getVipCourseDataList(@Param("organIds") Set<Integer> organIds,
                                               @Param("dataTypes") Set<String> dataTypes,
                                               @Param("startMonth") String startMonth,
-                                              @Param("endMonth") String endMonth);
+                                              @Param("endMonth") String endMonth,@Param("tenantId") Integer tenantId);
 
 	List<IndexBaseMonthData> getWithDayAndDataType(@Param("day") String day,
-                                                   @Param("dataType")IndexDataType dataType);
+                                                   @Param("dataType")IndexDataType dataType,@Param("tenantId") Integer tenantId);
 
 	/**
 	 * @describe 统计学员注册数据
@@ -63,7 +63,7 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
 	 * @param dayStr:
 	 * @return java.util.List<com.ym.mec.biz.dal.entity.IndexBaseMonthData>
 	 */
-	List<IndexBaseMonthData> getStudentRegistrationData(@Param("dayStr") String dayStr);
+	List<IndexBaseMonthData> getStudentRegistrationData(@Param("dayStr") String dayStr,@Param("tenantId") Integer tenantId);
 
 	/**
 	 * @describe 统计新增学员注册数据
@@ -72,7 +72,7 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
 	 * @param dayStr:
 	 * @return java.util.List<com.ym.mec.biz.dal.entity.IndexBaseMonthData>
 	 */
-	List<IndexBaseMonthData> getAddStudentRegistrationData(@Param("dayStr") String dayStr);
+	List<IndexBaseMonthData> getAddStudentRegistrationData(@Param("dayStr") String dayStr,@Param("tenantId") Integer tenantId);
 
 	/**
 	 * @describe 付费转化率
@@ -81,7 +81,7 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
 	 * @param dayStr:
 	 * @return java.util.List<com.ym.mec.biz.dal.entity.IndexBaseMonthData>
 	 */
-	List<IndexBaseMonthData> getChargeStudentChangeData(@Param("dayStr") String dayStr);
+	List<IndexBaseMonthData> getChargeStudentChangeData(@Param("dayStr") String dayStr,@Param("tenantId") Integer tenantId);
 
     /**
      * @describe 统计系统中指定时间段的学员注册数据
@@ -90,7 +90,7 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
      * @return java.util.List<com.ym.mec.biz.dal.dto.IndexBaseMonthDto>
      */
     List<IndexBaseMonthData> getStudentSignUpData(@Param("dayStr") String dayStr,
-                                                  @Param("courseStartDay") String courseStartDay);
+                                                  @Param("courseStartDay") String courseStartDay,@Param("tenantId") Integer tenantId);
 
     /**
      * @describe 统计作业布置数据
@@ -99,7 +99,7 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
      * @return java.util.List<com.ym.mec.biz.dal.dto.IndexBaseMonthDto>
      */
     List<IndexBaseMonthData> getHomeworkData(@Param("dayStr") String dayStr,
-                                             @Param("type") String type);
+                                             @Param("type") String type,@Param("tenantId") Integer tenantId);
 
     /**
      * @describe 统计合作单位数据
@@ -107,7 +107,7 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
      * @date 2021/1/11 0011
      * @return java.util.List<com.ym.mec.biz.dal.entity.IndexBaseMonthData>
      */
-    List<IndexBaseMonthData> getSchoolData(@Param("dayStr") String dayStr);
+    List<IndexBaseMonthData> getSchoolData(@Param("dayStr") String dayStr,@Param("tenantId") Integer tenantId);
 
     /**
      * @describe 统计乐团数据
@@ -115,7 +115,7 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
      * @date 2021/1/11 0011
      * @return java.util.List<com.ym.mec.biz.dal.entity.IndexBaseMonthData>
      */
-    List<IndexBaseMonthData> getMusicData(@Param("dayStr") String dayStr);
+    List<IndexBaseMonthData> getMusicData(@Param("dayStr") String dayStr,@Param("tenantId") Integer tenantId);
 
     /**
      * @describe 统计乐团学员数据
@@ -124,34 +124,34 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
      * @return java.util.List<com.ym.mec.biz.dal.entity.IndexBaseMonthData>
      */
     List<IndexBaseMonthData> getMusicStudentData(@Param("dayStr") String dayStr,
-                                                 @Param("type") String type);
+                                                 @Param("type") String type,@Param("tenantId") Integer tenantId);
 
-    List<IndexBaseMonthData> getMusicGroupPreRegistrationStudentData(@Param("dayStr") String dayStr);
+    List<IndexBaseMonthData> getMusicGroupPreRegistrationStudentData(@Param("dayStr") String dayStr,@Param("tenantId") Integer tenantId);
 
     List<IndexBaseMonthData> getMusicGroupStudentFromPreData(@Param("dayStr") String dayStr,
-                                                             @Param("paymentStatus") PaymentStatusEnum paymentStatus);
+                                                             @Param("paymentStatus") PaymentStatusEnum paymentStatus,@Param("tenantId") Integer tenantId);
 
     List<Integer> getMusicGroupStudentIdFromPre(@Param("dayStr") String dayStr,
-                                                @Param("paymentStatus") PaymentStatusEnum paymentStatus);
+                                                @Param("paymentStatus") PaymentStatusEnum paymentStatus,@Param("tenantId") Integer tenantId);
 
     List<IndexBaseMonthData> getStudentConversionData(@Param("dayStr") String dayStr,
-                                                      @Param("studentIds") List<Integer> studentIds);
+                                                      @Param("studentIds") List<Integer> studentIds,@Param("tenantId") Integer tenantId);
 
-    List<IndexBaseMonthData> getOtherStudentData(@Param("dayStr") String dayStr);
+    List<IndexBaseMonthData> getOtherStudentData(@Param("dayStr") String dayStr,@Param("tenantId") Integer tenantId);
 
-    List<IndexBaseMonthData> getVipPracticeAddStudentData(@Param("dayStr") String dayStr);
+    List<IndexBaseMonthData> getVipPracticeAddStudentData(@Param("dayStr") String dayStr,@Param("tenantId") Integer tenantId);
 
     List<IndexBaseMonthData> getTeacherData(@Param("dayStr") String dayStr,
                                             @Param("jobNature") JobNatureEnum jobNature,
-                                            @Param("isDemission") Boolean isDemission);
+                                            @Param("isDemission") Boolean isDemission,@Param("tenantId") Integer tenantId);
 
     List<IndexBaseMonthData> getGroupCourseData(@Param("dayStr") String dayStr,
                                                 @Param("groupType")GroupType groupType,
-                                                @Param("courseStatus") CourseStatusEnum courseStatus);
+                                                @Param("courseStatus") CourseStatusEnum courseStatus,@Param("tenantId") Integer tenantId);
 
     List<IndexBaseMonthData> getGroupSurplusCourseData(@Param("dayStr") String dayStr,
                                                 @Param("groupType")GroupType groupType,
-                                                @Param("courseStatus") CourseStatusEnum courseStatus);
+                                                @Param("courseStatus") CourseStatusEnum courseStatus,@Param("tenantId") Integer tenantId);
 
     List<IndexBaseMonthData> getGroupCourseDataWithGroup(@Param("dayStr") String dayStr,
                                                         @Param("startDate") String startDate,
@@ -159,7 +159,7 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
                                                         @Param("groupType")GroupType groupType,
                                                         @Param("courseStatus") CourseStatusEnum courseStatus,
                                                          @Param("teachMode") TeachModeEnum teachMode,
-                                                         @Param("organIds") List<Integer> organIds);
+                                                         @Param("organIds") List<Integer> organIds,@Param("tenantId") Integer tenantId);
 
     List<OrganVipGroupCategoryCourseNumDto> getVipGroupCategoryCourseData(@Param("dayStr") String dayStr,
                                                                           @Param("startDate") String startDate,
@@ -167,38 +167,38 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
                                                                           @Param("groupType")GroupType groupType,
                                                                           @Param("courseStatus") CourseStatusEnum courseStatus,
                                                                           @Param("teachMode") TeachModeEnum teachMode,
-                                                                          @Param("organIds") List<Integer> organIds);
+                                                                          @Param("organIds") List<Integer> organIds,@Param("tenantId") Integer tenantId);
 
-    int countLessThenThreeClassGroupNum(@Param("organIds") Set<Integer> organIds, @Param("educationUserId") Integer educationUserId);
+    int countLessThenThreeClassGroupNum(@Param("organIds") Set<Integer> organIds, @Param("educationUserId") Integer educationUserId,@Param("tenantId") Integer tenantId);
 
-    List<Map<Integer, Integer>> countLessThenThreeClassOrganGroupNum(@Param("organIds") Set<Integer> organIds, @Param("educationUserId") Integer educationUserId);
+    List<Map<Integer, Integer>> countLessThenThreeClassOrganGroupNum(@Param("organIds") Set<Integer> organIds, @Param("educationUserId") Integer educationUserId,@Param("tenantId") Integer tenantId);
 
-    List<String> getLessThenThreeMusicGroup(@Param("organIds") Set<Integer> organIds);
+    List<String> getLessThenThreeMusicGroup(@Param("organIds") Set<Integer> organIds,@Param("tenantId") Integer tenantId);
 
-    int queryErrInspection(@Param("organIds") Set<Integer> organIds, @Param("startTime") String startTime);
+    int queryErrInspection(@Param("organIds") Set<Integer> organIds, @Param("startTime") String startTime,@Param("tenantId") Integer tenantId);
 
-    List<Map<Integer, Integer>> queryOrganErrInspection(@Param("organIds") Set<Integer> organIds, @Param("startTime") String startTime);
+    List<Map<Integer, Integer>> queryOrganErrInspection(@Param("organIds") Set<Integer> organIds, @Param("startTime") String startTime,@Param("tenantId") Integer tenantId);
 
-    IndexErrInfoDto getNoClassMusicGroupStudentInfo(@Param("organIds") Set<Integer> organIds, @Param("educationUserId") Integer educationUserId);
+    IndexErrInfoDto getNoClassMusicGroupStudentInfo(@Param("organIds") Set<Integer> organIds, @Param("educationUserId") Integer educationUserId,@Param("tenantId") Integer tenantId);
 
-    List<Map<Integer, Integer>> getOrganNoClassMusicGroupStudentNum(@Param("organIds") Set<Integer> organIds, @Param("educationUserId") Integer educationUserId);
+    List<Map<Integer, Integer>> getOrganNoClassMusicGroupStudentNum(@Param("organIds") Set<Integer> organIds, @Param("educationUserId") Integer educationUserId,@Param("tenantId") Integer tenantId);
 
     int countNoPaymentStudentNum(@Param("organIds") Set<Integer> organIds,
                                  @Param("educationUserId") Integer educationUserId,
-                                 @Param("noPaymentType") Integer noPaymentType);
+                                 @Param("noPaymentType") Integer noPaymentType,@Param("tenantId") Integer tenantId);
 
 
 
-    List<Map<Integer, Integer>> countOrganNoPaymentStudentNum(@Param("organIds") Set<Integer> organIds, @Param("educationUserId") Integer educationUserId);
+    List<Map<Integer, Integer>> countOrganNoPaymentStudentNum(@Param("organIds") Set<Integer> organIds, @Param("educationUserId") Integer educationUserId,@Param("tenantId") Integer tenantId);
 
-    List<String> getNoPaymentMusicGroup(@Param("organIds") Set<Integer> organIds, @Param("educationUserId") Integer educationUserId);
+    List<String> getNoPaymentMusicGroup(@Param("organIds") Set<Integer> organIds, @Param("educationUserId") Integer educationUserId,@Param("tenantId") Integer tenantId);
 
-    List<Long> queryApplyForQuitGroupNum(@Param("organIds") Set<Integer> organIds, @Param("educationUserId") Integer educationUserId);
+    List<Long> queryApplyForQuitGroupNum(@Param("organIds") Set<Integer> organIds, @Param("educationUserId") Integer educationUserId,@Param("tenantId") Integer tenantId);
 
-    List<Map<Integer, Integer>> queryOrganApplyForQuitGroupNum(@Param("organIds") Set<Integer> organIds, @Param("educationUserId") Integer educationUserId);
+    List<Map<Integer, Integer>> queryOrganApplyForQuitGroupNum(@Param("organIds") Set<Integer> organIds, @Param("educationUserId") Integer educationUserId,@Param("tenantId") Integer tenantId);
 
     int queryStudentAttendanceInfo(@Param("organIds") Set<Integer> organIds,
-                                          @Param("type") String type, @Param("startTime") String startTime);
+                                          @Param("type") String type, @Param("startTime") String startTime,@Param("tenantId") Integer tenantId);
 
 
     /**
@@ -209,7 +209,7 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
     int getCourseTimeError(@Param("organIds") Set<Integer> organIds,
                            @Param("classGroupIds") List<Long> classGroupIds,
                            @Param("courseStartTimeError") String courseStartTimeError,
-                           @Param("courseEndTimeError") String courseEndTimeError);
+                           @Param("courseEndTimeError") String courseEndTimeError,@Param("tenantId") Integer tenantId);
 
     List<Map<Integer, Integer>> getOrganCourseTimeError(@Param("organIds") Set<Integer> organIds, @Param("classGroupIds") List<Long> classGroupIds);
 
@@ -218,23 +218,23 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
      * @param organIds
      * @return
      */
-    int getAttendanceError(@Param("organIds") Set<Integer> organIds, @Param("startTime") String startTime, @Param("classGroupIds") List<Long> classGroupIds);
-    List<Map<Integer, Integer>> getOrganAttendanceError(@Param("organIds") Set<Integer> organIds, @Param("startTime") String startTime, @Param("classGroupIds") List<Long> classGroupIds);
+    int getAttendanceError(@Param("organIds") Set<Integer> organIds, @Param("startTime") String startTime, @Param("classGroupIds") List<Long> classGroupIds,@Param("tenantId") Integer tenantId);
+    List<Map<Integer, Integer>> getOrganAttendanceError(@Param("organIds") Set<Integer> organIds, @Param("startTime") String startTime, @Param("classGroupIds") List<Long> classGroupIds,@Param("tenantId") Integer tenantId);
 
     /**
      * 获取旷课考勤
      * @param organIds
      * @return
      */
-    int getNoAttendance(@Param("organIds") Set<Integer> organIds, @Param("startTime") String startTime, @Param("classGroupIds") List<Long> classGroupIds);
-    List<Map<Integer, Integer>> getOrganNoAttendance(@Param("organIds") Set<Integer> organIds, @Param("startTime") String startTime, @Param("classGroupIds") List<Long> classGroupIds);
+    int getNoAttendance(@Param("organIds") Set<Integer> organIds, @Param("startTime") String startTime, @Param("classGroupIds") List<Long> classGroupIds,@Param("tenantId") Integer tenantId);
+    List<Map<Integer, Integer>> getOrganNoAttendance(@Param("organIds") Set<Integer> organIds, @Param("startTime") String startTime, @Param("classGroupIds") List<Long> classGroupIds,@Param("tenantId") Integer tenantId);
 
     /**
      * 获取老师离职申请数
      * @param organIdsStr
      * @return
      */
-    int queryTeacherLeave(@Param("organIdsStr") String organIdsStr, @Param("startTime") String startTime);
+    int queryTeacherLeave(@Param("organIdsStr") String organIdsStr, @Param("startTime") String startTime,@Param("tenantId") Integer tenantId);
 
     /**
      * 获取预计课酬偏低的老师编号
@@ -242,7 +242,7 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
      * @param monthStr
      * @return
      */
-    int queryLowTeacherSalary(@Param("organIdsStr") String organIdsStr, @Param("monthStr") String monthStr);
+    int queryLowTeacherSalary(@Param("organIdsStr") String organIdsStr, @Param("monthStr") String monthStr,@Param("tenantId") Integer tenantId);
 
     /**
      * 获取预计课酬偏低的老师编号
@@ -250,49 +250,49 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
      * @param monthStr
      * @return
      */
-    List<Map<Integer, Integer>> queryOrganLowTeacherSalary(@Param("organIdsStr") String organIdsStr, @Param("monthStr") String monthStr);
+    List<Map<Integer, Integer>> queryOrganLowTeacherSalary(@Param("organIdsStr") String organIdsStr, @Param("monthStr") String monthStr,@Param("tenantId") Integer tenantId);
 
     /**
      * 乐团巡查任务未计划
      * @param organIdsStr
      * @return
      */
-    int queryInspectionItem(@Param("organIdsStr") String organIdsStr, @Param("startTime") String startTime, @Param("userId") Integer userId);
-    List<Map<Integer, Integer>> queryOrganInspectionItem(@Param("organIdsStr") String organIdsStr, @Param("startTime") String startTime, @Param("userId") Integer userId);
+    int queryInspectionItem(@Param("organIdsStr") String organIdsStr, @Param("startTime") String startTime, @Param("userId") Integer userId,@Param("tenantId") Integer tenantId);
+    List<Map<Integer, Integer>> queryOrganInspectionItem(@Param("organIdsStr") String organIdsStr, @Param("startTime") String startTime, @Param("userId") Integer userId,@Param("tenantId") Integer tenantId);
 
     /**
      * 乐团巡查任务未提交
      * @param organIdsStr
      * @return
      */
-    int queryInspectionItemPlan(@Param("organIdsStr") String organIdsStr, @Param("startTime") String startTime);
-    List<Map<Integer, Integer>> queryOrganInspectionItemPlan(@Param("organIdsStr") String organIdsStr, @Param("startTime") String startTime);
+    int queryInspectionItemPlan(@Param("organIdsStr") String organIdsStr, @Param("startTime") String startTime,@Param("tenantId") Integer tenantId);
+    List<Map<Integer, Integer>> queryOrganInspectionItemPlan(@Param("organIdsStr") String organIdsStr, @Param("startTime") String startTime,@Param("tenantId") Integer tenantId);
 
     /**
      * 未完成的回访任务
      * @param organIdsStr
      * @return
      */
-    int queryStudentVisit(@Param("organIdsStr") String organIdsStr, @Param("startTime") String startTime, @Param("userId") Integer userId);
-    List<Map<Integer, Integer>> queryOrganStudentVisit(@Param("organIdsStr") String organIdsStr, @Param("startTime") String startTime, @Param("userId") Integer userId);
+    int queryStudentVisit(@Param("organIdsStr") String organIdsStr, @Param("startTime") String startTime, @Param("userId") Integer userId,@Param("tenantId") Integer tenantId);
+    List<Map<Integer, Integer>> queryOrganStudentVisit(@Param("organIdsStr") String organIdsStr, @Param("startTime") String startTime, @Param("userId") Integer userId,@Param("tenantId") Integer tenantId);
 
-    List<IndexBaseMonthData> getFinancePayData(@Param("dayStr") String dayStr);
+    List<IndexBaseMonthData> getFinancePayData(@Param("dayStr") String dayStr,@Param("tenantId") Integer tenantId);
 
-    List<IndexBaseMonthData> getFinanceBalanceData(@Param("dayStr") String dayStr);
+    List<IndexBaseMonthData> getFinanceBalanceData(@Param("dayStr") String dayStr,@Param("tenantId") Integer tenantId);
 
-    List<IndexBaseMonthData> getFinanceActualData(@Param("dayStr") String dayStr);
+    List<IndexBaseMonthData> getFinanceActualData(@Param("dayStr") String dayStr,@Param("tenantId") Integer tenantId);
 
     List<IndexBaseMonthData> getFinancePayDataWithTimely(@Param("startDate") String startDate,
                                                          @Param("endDate") String endDate,
-                                                         @Param("organIds") List<Integer> organIds);
+                                                         @Param("organIds") List<Integer> organIds,@Param("tenantId") Integer tenantId);
 
     List<IndexBaseMonthData> getFinanceBalanceDataWithTimely(@Param("startDate") String startDate,
                                                              @Param("endDate") String endDate,
-                                                             @Param("organIds") List<Integer> organIds);
+                                                             @Param("organIds") List<Integer> organIds,@Param("tenantId") Integer tenantId);
 
     List<IndexBaseMonthData> getFinanceActualDataWithTimely(@Param("startDate") String startDate,
                                                             @Param("endDate") String endDate,
-                                                            @Param("organIds") List<Integer> organIds);
+                                                            @Param("organIds") List<Integer> organIds,@Param("tenantId") Integer tenantId);
 
     /**
      * @describe 各分部教师服务指标异常
@@ -305,28 +305,28 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
 
     List<IndexBaseMonthData> getTotalAmountDataWithTimely(@Param("startDate") String startDate,
                                                             @Param("endDate") String endDate,
-                                                            @Param("organIds") List<Integer> organIds);
+                                                            @Param("organIds") List<Integer> organIds,@Param("tenantId") Integer tenantId);
 
     List<IndexBaseMonthData> getTotalAmountDataWithTimelyDetails(@Param("startDate") String startDate,
                                                                  @Param("endDate") String endDate,
                                                                  @Param("organIds") List<Integer> organIds,
                                                                  @Param("orderType") String orderType,
-                                                                 @Param("notOrderType") List<String> notOrderType);
+                                                                 @Param("notOrderType") List<String> notOrderType,@Param("tenantId") Integer tenantId);
 
     List<IndexBaseMonthData> getVipAmountDataWithTimelyDetails(@Param("startDate") String startDate,
                                                                  @Param("endDate") String endDate,
-                                                                 @Param("organIds") List<Integer> organIds);
+                                                                 @Param("organIds") List<Integer> organIds,@Param("tenantId") Integer tenantId);
 
     List<IndexBaseMonthData> getOtherAmountDataWithTimelyDetails(@Param("startDate") String startDate,
                                                                  @Param("endDate") String endDate,
-                                                                 @Param("organIds") List<Integer> organIds);
+                                                                 @Param("organIds") List<Integer> organIds,@Param("tenantId") Integer tenantId);
 
     int countStudentErrorLeave(@Param("organIdList") Set<Integer> organIdList,
                                @Param("format") String format,
                                @Param("classGroupIds") List<Long> classGroupIds,
-                               @Param("studentErrorLeaveNum") Integer studentErrorLeaveNum);
+                               @Param("studentErrorLeaveNum") Integer studentErrorLeaveNum,@Param("tenantId") Integer tenantId);
 
-    List<Map<Integer, Integer>> countOrganStudentErrorLeave(@Param("organIds") Set<Integer> organIds, @Param("classGroupIds") List<Long> classGroupIds);
+    List<Map<Integer, Integer>> countOrganStudentErrorLeave(@Param("organIds") Set<Integer> organIds, @Param("classGroupIds") List<Long> classGroupIds,@Param("tenantId") Integer tenantId);
 
     int countStudentErrorLeave1(Map<String, Object> params);
 
@@ -338,19 +338,19 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
 
     List<Map<Integer, BigDecimal>> getStudentErrorLeaveNumMap(Map<String, Object> params);
 
-    List<IndexBaseMonthData> getOrgansStudentNumData(@Param("dayStr") String dayStr);
+    List<IndexBaseMonthData> getOrgansStudentNumData(@Param("dayStr") String dayStr,@Param("tenantId") Integer tenantId);
 
-    List<IndexBaseMonthData> getMemberStudentNumData(@Param("dayStr") String dayStr);
+    List<IndexBaseMonthData> getMemberStudentNumData(@Param("dayStr") String dayStr,@Param("tenantId") Integer tenantId);
 
-    List<IndexBaseMonthData> getNewMemberStudentNumData(@Param("dayStr") String dayStr);
+    List<IndexBaseMonthData> getNewMemberStudentNumData(@Param("dayStr") String dayStr,@Param("tenantId") Integer tenantId);
 
-    List<IndexBaseMonthData> getExperienceMemberStudentNumData(@Param("dayStr") String dayStr);
+    List<IndexBaseMonthData> getExperienceMemberStudentNumData(@Param("dayStr") String dayStr,@Param("tenantId") Integer tenantId);
 
-    List<IndexBaseMonthData> getCloudStudyDayUseStudentNumData(@Param("dayStr") String dayStr);
+    List<IndexBaseMonthData> getCloudStudyDayUseStudentNumData(@Param("dayStr") String dayStr,@Param("tenantId") Integer tenantId);
 
-    List<IndexBaseMonthData> getCloudStudyLivelyStudentNumData(@Param("dayStr") String dayStr);
+    List<IndexBaseMonthData> getCloudStudyLivelyStudentNumData(@Param("dayStr") String dayStr,@Param("tenantId") Integer tenantId);
 
-    List<IndexBaseMonthData> getCloudStudyNewStudentNumData(@Param("dayStr") String dayStr);
+    List<IndexBaseMonthData> getCloudStudyNewStudentNumData(@Param("dayStr") String dayStr,@Param("tenantId") Integer tenantId);
 
     /**
      * 云教练活动分部统计
@@ -359,9 +359,4 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
      */
     List<CloudTeacherActiveTargetDto> countCloudTeacherActive(Map<String, Object> params);
 
-    /**
-     * 获取各分部学员总人数
-     * @return
-     */
-    List<Map<String, Long>> countTotalStudentNum();
 }

+ 2 - 11
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/IndexErrDataRecordDao.java

@@ -29,16 +29,7 @@ public interface IndexErrDataRecordDao extends BaseDAO<Long, IndexErrDataRecord>
      * @param generateTime:
      * @return int
      */
-    int countWithGenerateTime(@Param("generateTime") String generateTime);
-
-    /**
-     * @describe 获取所有异常相关教务老师编号
-     * @author Joburgess
-     * @date 2021/6/2 0002
-     * @param organIds:
-     * @return java.util.List<java.lang.Integer>
-     */
-    List<Integer> getAllDealUserIds(@Param("organIds") Collection organIds);
+    int countWithGenerateTime(@Param("generateTime") String generateTime, @Param("tenantId") Integer tenantId);
 
     /**
      * @describe 根据产生日期
@@ -50,7 +41,7 @@ public interface IndexErrDataRecordDao extends BaseDAO<Long, IndexErrDataRecord>
      */
     List<IndexErrDataRecord> getWithGenerateTime(@Param("organIds") Set<Integer> organIds,
                                                  @Param("generateStartTime") String generateStartTime,
-                                                @Param("generateEndTime") String generateEndTime);
+                                                @Param("generateEndTime") String generateEndTime, @Param("tenantId") Integer tenantId);
 
     /**
      * @describe 查询未处理记录

+ 0 - 9
mec-biz/src/main/java/com/ym/mec/biz/service/IndexErrDataRecordService.java

@@ -37,15 +37,6 @@ public interface IndexErrDataRecordService extends BaseService<Long, IndexErrDat
      */
     List<IndexErrorDataExportDto> errRecordExport(String organIds, String startDate, String endDate);
 
-    /**
-     * @describe 获取所有异常相关教务人员
-     * @author Joburgess
-     * @date 2021/6/2 0002
-     * @param organIds:
-     * @return java.util.List<com.ym.mec.biz.dal.dto.SimpleUserDto>
-     */
-    List<SimpleUserDto> getAllEducationUsers(String organIds);
-
     PageInfo<IndexErrorDataExportDto> queryRecord(IndexErrRecordQueryInfo queryInfo);
 
     /**

+ 105 - 100
mec-biz/src/main/java/com/ym/mec/biz/service/impl/IndexBaseMonthDataServiceImpl.java

@@ -113,7 +113,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			dataTypes = Arrays.stream(queryInfo.getDataTypes().split(",")).collect(Collectors.toSet());
 		}
 
-		List<IndexBaseMonthData> indexBaseDatas = indexBaseMonthDataDao.getIndexBaseData(organIds, dataTypes, startDate.toString(), endDate.toString());
+		List<IndexBaseMonthData> indexBaseDatas = indexBaseMonthDataDao.getIndexBaseData(organIds, dataTypes, startDate.toString(), endDate.toString(),queryInfo.getTenantId());
 		if(Objects.isNull(indexBaseDatas)){
 			indexBaseDatas = new ArrayList<>();
 		}
@@ -124,7 +124,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			vipDataTypes.add("VIP_GROUP_COURSE");
 			vipDataTypes.add("VIP_GROUP_ONLINE_COURSE");
 			vipDataTypes.add("VIP_GROUP_OFFLINE_COURSE");
-			List<IndexBaseMonthData> indexBaseDataList = indexBaseMonthDataDao.getVipCourseDataList(organIds, vipDataTypes, startDate.toString(), endDate.toString());
+			List<IndexBaseMonthData> indexBaseDataList = indexBaseMonthDataDao.getVipCourseDataList(organIds, vipDataTypes, startDate.toString(), endDate.toString(),queryInfo.getTenantId());
 			if(!CollectionUtils.isEmpty(indexBaseDataList)){
 				for (IndexBaseMonthData indexBaseMonthData : indexBaseDataList) {
 					if(StringUtils.isBlank(indexBaseMonthData.getExtendInfo())){
@@ -150,22 +150,22 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		Map<IndexDataType, List<IndexBaseMonthData>> typeDateMap = indexBaseDatas.stream().filter(d->Objects.nonNull(d.getDataType())).collect(Collectors.groupingBy(IndexBaseMonthData::getDataType));
 
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(FINANCE_PAY.getCode())||dataTypes.contains(FINANCE_BALANCE_AMOUNT.getCode())||dataTypes.contains(FINANCE_AMOUNT.getCode())){
-			List<IndexBaseMonthData> financePayDataWithTimely = indexBaseMonthDataDao.getFinancePayDataWithTimely(startDate.toString(), endDate.toString(), new ArrayList<>(organIds));
+			List<IndexBaseMonthData> financePayDataWithTimely = indexBaseMonthDataDao.getFinancePayDataWithTimely(startDate.toString(), endDate.toString(), new ArrayList<>(organIds),queryInfo.getTenantId());
 			typeDateMap.put(IndexDataType.FINANCE_PAY,financePayDataWithTimely);
-			typeDateMap.put(IndexDataType.FINANCE_BALANCE_AMOUNT,indexBaseMonthDataDao.getFinanceBalanceDataWithTimely(startDate.toString(), endDate.toString(), new ArrayList<>(organIds)));
-			typeDateMap.put(FINANCE_AMOUNT,indexBaseMonthDataDao.getFinanceActualDataWithTimely(startDate.toString(), endDate.toString(), new ArrayList<>(organIds)));
-			List<IndexBaseMonthData> totalAmountDataWithTimely = indexBaseMonthDataDao.getTotalAmountDataWithTimely(startDate.toString(), endDate.toString(), new ArrayList<>(organIds));
+			typeDateMap.put(IndexDataType.FINANCE_BALANCE_AMOUNT,indexBaseMonthDataDao.getFinanceBalanceDataWithTimely(startDate.toString(), endDate.toString(), new ArrayList<>(organIds),queryInfo.getTenantId()));
+			typeDateMap.put(FINANCE_AMOUNT,indexBaseMonthDataDao.getFinanceActualDataWithTimely(startDate.toString(), endDate.toString(), new ArrayList<>(organIds),queryInfo.getTenantId()));
+			List<IndexBaseMonthData> totalAmountDataWithTimely = indexBaseMonthDataDao.getTotalAmountDataWithTimely(startDate.toString(), endDate.toString(), new ArrayList<>(organIds),queryInfo.getTenantId());
 			typeDateMap.put(IndexDataType.TOTAL_AMOUNT,totalAmountDataWithTimely);
 			//经营报表细化
-			List<IndexBaseMonthData> applyAmount = indexBaseMonthDataDao.getTotalAmountDataWithTimelyDetails(startDate.toString(), endDate.toString(), new ArrayList<>(organIds),"APPLY,ADD_STUDENT",null);
+			List<IndexBaseMonthData> applyAmount = indexBaseMonthDataDao.getTotalAmountDataWithTimelyDetails(startDate.toString(), endDate.toString(), new ArrayList<>(organIds),"APPLY,ADD_STUDENT",null,queryInfo.getTenantId());
 			typeDateMap.put(APPLY_AMOUNT,applyAmount);
-			List<IndexBaseMonthData> renewAmount = indexBaseMonthDataDao.getTotalAmountDataWithTimelyDetails(startDate.toString(), endDate.toString(), new ArrayList<>(organIds),"RENEW",null);
+			List<IndexBaseMonthData> renewAmount = indexBaseMonthDataDao.getTotalAmountDataWithTimelyDetails(startDate.toString(), endDate.toString(), new ArrayList<>(organIds),"RENEW",null,queryInfo.getTenantId());
 			typeDateMap.put(RENEW_AMOUNT,renewAmount);
-			List<IndexBaseMonthData> vipAmount = indexBaseMonthDataDao.getVipAmountDataWithTimelyDetails(startDate.toString(), endDate.toString(), new ArrayList<>(organIds));
+			List<IndexBaseMonthData> vipAmount = indexBaseMonthDataDao.getVipAmountDataWithTimelyDetails(startDate.toString(), endDate.toString(), new ArrayList<>(organIds),queryInfo.getTenantId());
 			typeDateMap.put(VIP_AMOUNT,vipAmount);
-			List<IndexBaseMonthData> practiceAmount = indexBaseMonthDataDao.getTotalAmountDataWithTimelyDetails(startDate.toString(), endDate.toString(), new ArrayList<>(organIds),"PRACTICE_GROUP_BUY,PRACTICE_GROUP_RENEW",null);
+			List<IndexBaseMonthData> practiceAmount = indexBaseMonthDataDao.getTotalAmountDataWithTimelyDetails(startDate.toString(), endDate.toString(), new ArrayList<>(organIds),"PRACTICE_GROUP_BUY,PRACTICE_GROUP_RENEW",null,queryInfo.getTenantId());
 			typeDateMap.put(PRACTICE_AMOUNT,practiceAmount);
-			List<IndexBaseMonthData> otherAmount = indexBaseMonthDataDao.getOtherAmountDataWithTimelyDetails(startDate.toString(), endDate.toString(), new ArrayList<>(organIds));
+			List<IndexBaseMonthData> otherAmount = indexBaseMonthDataDao.getOtherAmountDataWithTimelyDetails(startDate.toString(), endDate.toString(), new ArrayList<>(organIds),queryInfo.getTenantId());
 			typeDateMap.put(OTHER_AMOUNT,otherAmount);
 		}
 
@@ -173,13 +173,13 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 				||dataTypes.contains(VIP_GROUP_ONLINE_COURSE.getCode())||dataTypes.contains(VIP_GROUP_OFFLINE_COURSE.getCode())
 				||dataTypes.contains(PRACTICE_GROUP_COURSE.getCode())){
 			if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.MUSIC_GROUP_COURSE.getCode())) {
-				List<IndexBaseMonthData> musicCourseData = indexBaseMonthDataDao.getGroupCourseDataWithGroup(null, startDate.toString(), endDate.toString(), GroupType.MUSIC, null, null, new ArrayList<>(organIds));
+				List<IndexBaseMonthData> musicCourseData = indexBaseMonthDataDao.getGroupCourseDataWithGroup(null, startDate.toString(), endDate.toString(), GroupType.MUSIC, null, null, new ArrayList<>(organIds),queryInfo.getTenantId());
 				typeDateMap.put(MUSIC_GROUP_COURSE,musicCourseData);
 			}
 
 			if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.VIP_GROUP_COURSE.getCode())) {
-				List<IndexBaseMonthData> vipCourseData = indexBaseMonthDataDao.getGroupCourseDataWithGroup(null, startDate.toString(), endDate.toString(), GroupType.VIP, null, null, new ArrayList<>(organIds));
-				List<OrganVipGroupCategoryCourseNumDto> vipGroupCategoryCourseData = indexBaseMonthDataDao.getVipGroupCategoryCourseData(null, startDate.toString(), endDate.toString(), GroupType.VIP, null, null, new ArrayList<>(organIds));
+				List<IndexBaseMonthData> vipCourseData = indexBaseMonthDataDao.getGroupCourseDataWithGroup(null, startDate.toString(), endDate.toString(), GroupType.VIP, null, null, new ArrayList<>(organIds),queryInfo.getTenantId());
+				List<OrganVipGroupCategoryCourseNumDto> vipGroupCategoryCourseData = indexBaseMonthDataDao.getVipGroupCategoryCourseData(null, startDate.toString(), endDate.toString(), GroupType.VIP, null, null, new ArrayList<>(organIds),queryInfo.getTenantId());
 				Map<Integer, Map<String, Integer>> organCategoryCourseMap = new HashMap<>();
 				if (!CollectionUtils.isEmpty(vipGroupCategoryCourseData)) {
 					organCategoryCourseMap = vipGroupCategoryCourseData.stream().collect(Collectors.groupingBy(OrganVipGroupCategoryCourseNumDto::getOrganId, Collectors.toMap(OrganVipGroupCategoryCourseNumDto::getCategoryName, o -> o.getCourseNum())));
@@ -193,8 +193,8 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			}
 
 			if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.VIP_GROUP_ONLINE_COURSE.getCode())) {
-				List<IndexBaseMonthData> vipOnlineCourseData = indexBaseMonthDataDao.getGroupCourseDataWithGroup(null, startDate.toString(), endDate.toString(), GroupType.VIP, null, TeachModeEnum.ONLINE, new ArrayList<>(organIds));
-				List<OrganVipGroupCategoryCourseNumDto> vipGroupOnlineCategoryCourseData = indexBaseMonthDataDao.getVipGroupCategoryCourseData(null, startDate.toString(), endDate.toString(), GroupType.VIP, null, TeachModeEnum.ONLINE, new ArrayList<>(organIds));
+				List<IndexBaseMonthData> vipOnlineCourseData = indexBaseMonthDataDao.getGroupCourseDataWithGroup(null, startDate.toString(), endDate.toString(), GroupType.VIP, null, TeachModeEnum.ONLINE, new ArrayList<>(organIds),queryInfo.getTenantId());
+				List<OrganVipGroupCategoryCourseNumDto> vipGroupOnlineCategoryCourseData = indexBaseMonthDataDao.getVipGroupCategoryCourseData(null, startDate.toString(), endDate.toString(), GroupType.VIP, null, TeachModeEnum.ONLINE, new ArrayList<>(organIds),queryInfo.getTenantId());
 				Map<Integer, Map<String, Integer>> organOnlineCategoryCourseMap = new HashMap<>();
 				if (!CollectionUtils.isEmpty(vipGroupOnlineCategoryCourseData)) {
 					organOnlineCategoryCourseMap = vipGroupOnlineCategoryCourseData.stream().collect(Collectors.groupingBy(OrganVipGroupCategoryCourseNumDto::getOrganId, Collectors.toMap(OrganVipGroupCategoryCourseNumDto::getCategoryName, o -> o.getCourseNum())));
@@ -208,8 +208,8 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			}
 
 			if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.VIP_GROUP_OFFLINE_COURSE.getCode())) {
-				List<IndexBaseMonthData> vipOfflineCourseData = indexBaseMonthDataDao.getGroupCourseDataWithGroup(null, startDate.toString(), endDate.toString(), GroupType.VIP, null, TeachModeEnum.OFFLINE, new ArrayList<>(organIds));
-				List<OrganVipGroupCategoryCourseNumDto> vipGroupOfflineCategoryCourseData = indexBaseMonthDataDao.getVipGroupCategoryCourseData(null, startDate.toString(), endDate.toString(), GroupType.VIP, null, TeachModeEnum.OFFLINE, new ArrayList<>(organIds));
+				List<IndexBaseMonthData> vipOfflineCourseData = indexBaseMonthDataDao.getGroupCourseDataWithGroup(null, startDate.toString(), endDate.toString(), GroupType.VIP, null, TeachModeEnum.OFFLINE, new ArrayList<>(organIds),queryInfo.getTenantId());
+				List<OrganVipGroupCategoryCourseNumDto> vipGroupOfflineCategoryCourseData = indexBaseMonthDataDao.getVipGroupCategoryCourseData(null, startDate.toString(), endDate.toString(), GroupType.VIP, null, TeachModeEnum.OFFLINE, new ArrayList<>(organIds),queryInfo.getTenantId());
 				Map<Integer, Map<String, Integer>> organOfflineCategoryCourseMap = new HashMap<>();
 				if (!CollectionUtils.isEmpty(vipGroupOfflineCategoryCourseData)) {
 					organOfflineCategoryCourseMap = vipGroupOfflineCategoryCourseData.stream().collect(Collectors.groupingBy(OrganVipGroupCategoryCourseNumDto::getOrganId, Collectors.toMap(OrganVipGroupCategoryCourseNumDto::getCategoryName, o -> o.getCourseNum())));
@@ -223,7 +223,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			}
 
 			if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.PRACTICE_GROUP_COURSE.getCode())) {
-				List<IndexBaseMonthData> practiceCourses = indexBaseMonthDataDao.getGroupCourseDataWithGroup(null, startDate.toString(), endDate.toString(), GroupType.PRACTICE, null, null, new ArrayList<>(organIds));
+				List<IndexBaseMonthData> practiceCourses = indexBaseMonthDataDao.getGroupCourseDataWithGroup(null, startDate.toString(), endDate.toString(), GroupType.PRACTICE, null, null, new ArrayList<>(organIds),queryInfo.getTenantId());
 				typeDateMap.put(PRACTICE_GROUP_COURSE,practiceCourses);
 			}
 		}
@@ -340,24 +340,26 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 
 		LocalDate day = LocalDate.parse(dayStr, DateUtil.dateFormatter);
 		LocalDate monday = day.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
+		
+		Integer tenantId = TenantContextHolder.getTenantId();
 
 		//学员数据
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.STUDENT_REGISTRATION_NUM)){
-			saveData(indexBaseMonthDataDao.getStudentRegistrationData(dayStr), dayStr, IndexDataType.STUDENT_REGISTRATION_NUM);
+			saveData(indexBaseMonthDataDao.getStudentRegistrationData(dayStr,tenantId), dayStr, IndexDataType.STUDENT_REGISTRATION_NUM);
 		}
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.CHARGE_STUDENT_CHANGE_RATE)) {
-			saveData(indexBaseMonthDataDao.getChargeStudentChangeData(dayStr), dayStr, IndexDataType.CHARGE_STUDENT_CHANGE_RATE);
+			saveData(indexBaseMonthDataDao.getChargeStudentChangeData(dayStr,tenantId), dayStr, IndexDataType.CHARGE_STUDENT_CHANGE_RATE);
 		}
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.ACTIVATION_RATE)) {
-			saveData(indexBaseMonthDataDao.getStudentSignUpData(dayStr, nowDate.plusMonths(-6).toString()), dayStr, IndexDataType.ACTIVATION_RATE);
+			saveData(indexBaseMonthDataDao.getStudentSignUpData(dayStr, nowDate.plusMonths(-6).toString(),tenantId), dayStr, IndexDataType.ACTIVATION_RATE);
 		}
 
 		//运营数据
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.SCHOOL)) {
-			saveData(indexBaseMonthDataDao.getSchoolData(dayStr), dayStr, IndexDataType.SCHOOL);
+			saveData(indexBaseMonthDataDao.getSchoolData(dayStr,tenantId), dayStr, IndexDataType.SCHOOL);
 		}
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.PROGRESS_MUSIC_GROUP_NUM)) {
-			saveData(indexBaseMonthDataDao.getMusicData(dayStr), dayStr, IndexDataType.PROGRESS_MUSIC_GROUP_NUM);
+			saveData(indexBaseMonthDataDao.getMusicData(dayStr,tenantId), dayStr, IndexDataType.PROGRESS_MUSIC_GROUP_NUM);
 		}
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(TRANSACTION_TEACHER_NUM)) {
 			List<SimpleUserDto> transactionTeachers = employeeService.findByRole("58", null);
@@ -389,42 +391,42 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 
 		//人事数据
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.TEACHER_NUM)) {
-			saveData(indexBaseMonthDataDao.getTeacherData(dayStr, null, null), dayStr, IndexDataType.TEACHER_NUM);
+			saveData(indexBaseMonthDataDao.getTeacherData(dayStr, null, null,tenantId), dayStr, IndexDataType.TEACHER_NUM);
 		}
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.FULL_TIME_NUM)) {
-			saveData(indexBaseMonthDataDao.getTeacherData(dayStr, JobNatureEnum.FULL_TIME, null), dayStr, IndexDataType.FULL_TIME_NUM);
+			saveData(indexBaseMonthDataDao.getTeacherData(dayStr, JobNatureEnum.FULL_TIME, null,tenantId), dayStr, IndexDataType.FULL_TIME_NUM);
 		}
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.PART_TIME_NUM)) {
-			saveData(indexBaseMonthDataDao.getTeacherData(dayStr, JobNatureEnum.PART_TIME, null), dayStr, IndexDataType.PART_TIME_NUM);
+			saveData(indexBaseMonthDataDao.getTeacherData(dayStr, JobNatureEnum.PART_TIME, null,tenantId), dayStr, IndexDataType.PART_TIME_NUM);
 		}
 //		saveData(indexBaseMonthDataDao.getTeacherData(dayStr, null, true), dayStr, IndexDataType.DIMISSION_NUM);
 
 		//剩余课时
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.SURPLUS_COURSE_NUM)) {
-			saveData(indexBaseMonthDataDao.getGroupCourseData(dayStr, null, CourseStatusEnum.NOT_START), dayStr, IndexDataType.SURPLUS_COURSE_NUM);
+			saveData(indexBaseMonthDataDao.getGroupCourseData(dayStr, null, CourseStatusEnum.NOT_START,tenantId), dayStr, IndexDataType.SURPLUS_COURSE_NUM);
 		}
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.SURPLUS_MUSIC_COURSE_NUM)) {
-			saveData(indexBaseMonthDataDao.getGroupCourseData(dayStr, GroupType.MUSIC, CourseStatusEnum.NOT_START), dayStr, IndexDataType.SURPLUS_MUSIC_COURSE_NUM);
+			saveData(indexBaseMonthDataDao.getGroupCourseData(dayStr, GroupType.MUSIC, CourseStatusEnum.NOT_START,tenantId), dayStr, IndexDataType.SURPLUS_MUSIC_COURSE_NUM);
 		}
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.SURPLUS_VIP_COURSE_NUM)) {
-			saveData(indexBaseMonthDataDao.getGroupCourseData(dayStr, GroupType.VIP, CourseStatusEnum.NOT_START), dayStr, IndexDataType.SURPLUS_VIP_COURSE_NUM);
+			saveData(indexBaseMonthDataDao.getGroupCourseData(dayStr, GroupType.VIP, CourseStatusEnum.NOT_START,tenantId), dayStr, IndexDataType.SURPLUS_VIP_COURSE_NUM);
 		}
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.SURPLUS_PRACTICE_COURSE_NUM)) {
-			saveData(indexBaseMonthDataDao.getGroupCourseData(dayStr, GroupType.PRACTICE, CourseStatusEnum.NOT_START), dayStr, IndexDataType.SURPLUS_PRACTICE_COURSE_NUM);
+			saveData(indexBaseMonthDataDao.getGroupCourseData(dayStr, GroupType.PRACTICE, CourseStatusEnum.NOT_START,tenantId), dayStr, IndexDataType.SURPLUS_PRACTICE_COURSE_NUM);
 		}
 
 		//已消耗课时
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.OVER_COURSE_NUM)) {
-			saveData(indexBaseMonthDataDao.getGroupSurplusCourseData(dayStr, null, CourseStatusEnum.OVER), dayStr, IndexDataType.OVER_COURSE_NUM);
+			saveData(indexBaseMonthDataDao.getGroupSurplusCourseData(dayStr, null, CourseStatusEnum.OVER,tenantId), dayStr, IndexDataType.OVER_COURSE_NUM);
 		}
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.OVER_MUSIC_COURSE_NUM)) {
-			saveData(indexBaseMonthDataDao.getGroupSurplusCourseData(dayStr, GroupType.MUSIC, CourseStatusEnum.OVER), dayStr, IndexDataType.OVER_MUSIC_COURSE_NUM);
+			saveData(indexBaseMonthDataDao.getGroupSurplusCourseData(dayStr, GroupType.MUSIC, CourseStatusEnum.OVER,tenantId), dayStr, IndexDataType.OVER_MUSIC_COURSE_NUM);
 		}
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.OVER_VIP_COURSE_NUM)) {
-			saveData(indexBaseMonthDataDao.getGroupSurplusCourseData(dayStr, GroupType.VIP, CourseStatusEnum.OVER), dayStr, IndexDataType.OVER_VIP_COURSE_NUM);
+			saveData(indexBaseMonthDataDao.getGroupSurplusCourseData(dayStr, GroupType.VIP, CourseStatusEnum.OVER,tenantId), dayStr, IndexDataType.OVER_VIP_COURSE_NUM);
 		}
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.OVER_PRACTICE_COURSE_NUM)) {
-			saveData(indexBaseMonthDataDao.getGroupSurplusCourseData(dayStr, GroupType.PRACTICE, CourseStatusEnum.OVER), dayStr, IndexDataType.OVER_PRACTICE_COURSE_NUM);
+			saveData(indexBaseMonthDataDao.getGroupSurplusCourseData(dayStr, GroupType.PRACTICE, CourseStatusEnum.OVER,tenantId), dayStr, IndexDataType.OVER_PRACTICE_COURSE_NUM);
 		}
 
 		//经营数据
@@ -440,23 +442,23 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 
 		//业务数据
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.HOMEWORK_CREATE_RATE)) {
-			saveData(indexBaseMonthDataDao.getHomeworkData(dayStr, null), monday.toString(), IndexDataType.HOMEWORK_CREATE_RATE);
+			saveData(indexBaseMonthDataDao.getHomeworkData(dayStr, null,tenantId), monday.toString(), IndexDataType.HOMEWORK_CREATE_RATE);
 		}
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.HOMEWORK_SUBMIT_RATE)) {
-			saveData(indexBaseMonthDataDao.getHomeworkData(dayStr, "submit"), monday.toString(), IndexDataType.HOMEWORK_SUBMIT_RATE);
+			saveData(indexBaseMonthDataDao.getHomeworkData(dayStr, "submit",tenantId), monday.toString(), IndexDataType.HOMEWORK_SUBMIT_RATE);
 		}
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.HOMEWORK_COMMENT_RATE)) {
-			saveData(indexBaseMonthDataDao.getHomeworkData(dayStr, "comment"), monday.toString(), IndexDataType.HOMEWORK_COMMENT_RATE);
+			saveData(indexBaseMonthDataDao.getHomeworkData(dayStr, "comment",tenantId), monday.toString(), IndexDataType.HOMEWORK_COMMENT_RATE);
 		}
 
 		//课程数据
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.MUSIC_GROUP_COURSE)) {
-			saveData(indexBaseMonthDataDao.getGroupCourseDataWithGroup(dayStr, null, null, GroupType.MUSIC, null, null, null), dayStr, IndexDataType.MUSIC_GROUP_COURSE);
+			saveData(indexBaseMonthDataDao.getGroupCourseDataWithGroup(dayStr, null, null, GroupType.MUSIC, null, null, null,tenantId), dayStr, IndexDataType.MUSIC_GROUP_COURSE);
 		}
 
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.VIP_GROUP_COURSE)) {
-			List<IndexBaseMonthData> vipCourseData = indexBaseMonthDataDao.getGroupCourseDataWithGroup(dayStr, null, null, GroupType.VIP, null, null, null);
-			List<OrganVipGroupCategoryCourseNumDto> vipGroupCategoryCourseData = indexBaseMonthDataDao.getVipGroupCategoryCourseData(dayStr, null, null, GroupType.VIP, null, null, null);
+			List<IndexBaseMonthData> vipCourseData = indexBaseMonthDataDao.getGroupCourseDataWithGroup(dayStr, null, null, GroupType.VIP, null, null, null,tenantId);
+			List<OrganVipGroupCategoryCourseNumDto> vipGroupCategoryCourseData = indexBaseMonthDataDao.getVipGroupCategoryCourseData(dayStr, null, null, GroupType.VIP, null, null, null,tenantId);
 			Map<Integer, Map<String, Integer>> organCategoryCourseMap = new HashMap<>();
 			if (!CollectionUtils.isEmpty(vipGroupCategoryCourseData)) {
 				organCategoryCourseMap = vipGroupCategoryCourseData.stream().collect(Collectors.groupingBy(OrganVipGroupCategoryCourseNumDto::getOrganId, Collectors.toMap(OrganVipGroupCategoryCourseNumDto::getCategoryName, o -> o.getCourseNum())));
@@ -470,8 +472,8 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		}
 
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.VIP_GROUP_ONLINE_COURSE)) {
-			List<IndexBaseMonthData> vipOnlineCourseData = indexBaseMonthDataDao.getGroupCourseDataWithGroup(dayStr, null, null, GroupType.VIP, null, TeachModeEnum.ONLINE, null);
-			List<OrganVipGroupCategoryCourseNumDto> vipGroupOnlineCategoryCourseData = indexBaseMonthDataDao.getVipGroupCategoryCourseData(dayStr, null, null, GroupType.VIP, null, TeachModeEnum.ONLINE, null);
+			List<IndexBaseMonthData> vipOnlineCourseData = indexBaseMonthDataDao.getGroupCourseDataWithGroup(dayStr, null, null, GroupType.VIP, null, TeachModeEnum.ONLINE, null,tenantId);
+			List<OrganVipGroupCategoryCourseNumDto> vipGroupOnlineCategoryCourseData = indexBaseMonthDataDao.getVipGroupCategoryCourseData(dayStr, null, null, GroupType.VIP, null, TeachModeEnum.ONLINE, null,tenantId);
 			Map<Integer, Map<String, Integer>> organOnlineCategoryCourseMap = new HashMap<>();
 			if (!CollectionUtils.isEmpty(vipGroupOnlineCategoryCourseData)) {
 				organOnlineCategoryCourseMap = vipGroupOnlineCategoryCourseData.stream().collect(Collectors.groupingBy(OrganVipGroupCategoryCourseNumDto::getOrganId, Collectors.toMap(OrganVipGroupCategoryCourseNumDto::getCategoryName, o -> o.getCourseNum())));
@@ -485,8 +487,8 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		}
 
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.VIP_GROUP_OFFLINE_COURSE)) {
-			List<IndexBaseMonthData> vipOfflineCourseData = indexBaseMonthDataDao.getGroupCourseDataWithGroup(dayStr, null, null, GroupType.VIP, null, TeachModeEnum.OFFLINE, null);
-			List<OrganVipGroupCategoryCourseNumDto> vipGroupOfflineCategoryCourseData = indexBaseMonthDataDao.getVipGroupCategoryCourseData(dayStr, null, null, GroupType.VIP, null, TeachModeEnum.OFFLINE, null);
+			List<IndexBaseMonthData> vipOfflineCourseData = indexBaseMonthDataDao.getGroupCourseDataWithGroup(dayStr, null, null, GroupType.VIP, null, TeachModeEnum.OFFLINE, null,tenantId);
+			List<OrganVipGroupCategoryCourseNumDto> vipGroupOfflineCategoryCourseData = indexBaseMonthDataDao.getVipGroupCategoryCourseData(dayStr, null, null, GroupType.VIP, null, TeachModeEnum.OFFLINE, null,tenantId);
 			Map<Integer, Map<String, Integer>> organOfflineCategoryCourseMap = new HashMap<>();
 			if (!CollectionUtils.isEmpty(vipGroupOfflineCategoryCourseData)) {
 				organOfflineCategoryCourseMap = vipGroupOfflineCategoryCourseData.stream().collect(Collectors.groupingBy(OrganVipGroupCategoryCourseNumDto::getOrganId, Collectors.toMap(OrganVipGroupCategoryCourseNumDto::getCategoryName, o -> o.getCourseNum())));
@@ -500,15 +502,15 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		}
 
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.PRACTICE_GROUP_COURSE)) {
-			saveData(indexBaseMonthDataDao.getGroupCourseDataWithGroup(dayStr, null, null, GroupType.PRACTICE, null, null, null), dayStr, IndexDataType.PRACTICE_GROUP_COURSE);
+			saveData(indexBaseMonthDataDao.getGroupCourseDataWithGroup(dayStr, null, null, GroupType.PRACTICE, null, null, null,tenantId), dayStr, IndexDataType.PRACTICE_GROUP_COURSE);
 		}
 
 		//学员变动
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.ADD_STUDENT_REGISTRATION_NUM)) {
-			saveData(indexBaseMonthDataDao.getAddStudentRegistrationData(dayStr), dayStr, IndexDataType.ADD_STUDENT_REGISTRATION_NUM);
+			saveData(indexBaseMonthDataDao.getAddStudentRegistrationData(dayStr,tenantId), dayStr, IndexDataType.ADD_STUDENT_REGISTRATION_NUM);
 		}
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.MUSIC_GROUP_STUDENT)) {
-			saveData(indexBaseMonthDataDao.getMusicStudentData(dayStr, null), dayStr, IndexDataType.MUSIC_GROUP_STUDENT);
+			saveData(indexBaseMonthDataDao.getMusicStudentData(dayStr, null,tenantId), dayStr, IndexDataType.MUSIC_GROUP_STUDENT);
 		}
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.NEWLY_STUDENT_NUM)) {
 			saveData(null, nowDate.toString(), IndexDataType.NEWLY_STUDENT_NUM);
@@ -517,46 +519,46 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			saveData(null, nowDate.toString(), IndexDataType.QUIT_MUSIC_GROUP_STUDENT_NUM);
 		}
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.VIP_PRACTICE_STUDENT_NUM)) {
-			saveData(indexBaseMonthDataDao.getOtherStudentData(dayStr), dayStr, IndexDataType.VIP_PRACTICE_STUDENT_NUM);
+			saveData(indexBaseMonthDataDao.getOtherStudentData(dayStr,tenantId), dayStr, IndexDataType.VIP_PRACTICE_STUDENT_NUM);
 		}
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.VIP_PRACTICE_ADD_STUDENT_NUM)) {
-			saveData(indexBaseMonthDataDao.getVipPracticeAddStudentData(dayStr), dayStr, IndexDataType.VIP_PRACTICE_ADD_STUDENT_NUM);
+			saveData(indexBaseMonthDataDao.getVipPracticeAddStudentData(dayStr,tenantId), dayStr, IndexDataType.VIP_PRACTICE_ADD_STUDENT_NUM);
 		}
 
 		//云教练相关
 		//分部学员数量
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.ORGAN_TOTAL_STUDENT_NUM)) {
-			saveData(indexBaseMonthDataDao.getOrgansStudentNumData(dayStr), dayStr, IndexDataType.ORGAN_TOTAL_STUDENT_NUM);
+			saveData(indexBaseMonthDataDao.getOrgansStudentNumData(dayStr,tenantId), dayStr, IndexDataType.ORGAN_TOTAL_STUDENT_NUM);
 		}
 
 		//会员数量
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.MEMBER_STUDENT_NUM)) {
-			saveData(indexBaseMonthDataDao.getMemberStudentNumData(dayStr), dayStr, IndexDataType.MEMBER_STUDENT_NUM);
+			saveData(indexBaseMonthDataDao.getMemberStudentNumData(dayStr,tenantId), dayStr, IndexDataType.MEMBER_STUDENT_NUM);
 		}
 
 		//新增会员数量
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.NEW_MEMBER_STUDENT_NUM)) {
-			saveData(indexBaseMonthDataDao.getNewMemberStudentNumData(dayStr), dayStr, IndexDataType.NEW_MEMBER_STUDENT_NUM);
+			saveData(indexBaseMonthDataDao.getNewMemberStudentNumData(dayStr,tenantId), dayStr, IndexDataType.NEW_MEMBER_STUDENT_NUM);
 		}
 
 		//试用会员数量
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.EXPERIENCE_MEMBER_STUDENT_NUM)) {
-			saveData(indexBaseMonthDataDao.getExperienceMemberStudentNumData(dayStr), dayStr, IndexDataType.EXPERIENCE_MEMBER_STUDENT_NUM);
+			saveData(indexBaseMonthDataDao.getExperienceMemberStudentNumData(dayStr,tenantId), dayStr, IndexDataType.EXPERIENCE_MEMBER_STUDENT_NUM);
 		}
 
 		//云教练使用用户
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.CLOUD_STUDY_DAY_USE_STUDENT_NUM)) {
-			saveData(indexBaseMonthDataDao.getCloudStudyDayUseStudentNumData(dayStr), dayStr, IndexDataType.CLOUD_STUDY_DAY_USE_STUDENT_NUM);
+			saveData(indexBaseMonthDataDao.getCloudStudyDayUseStudentNumData(dayStr,tenantId), dayStr, IndexDataType.CLOUD_STUDY_DAY_USE_STUDENT_NUM);
 		}
 
 		//活跃用户
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.CLOUD_STUDY_LIVELY_STUDENT_NUM)) {
-			saveData(indexBaseMonthDataDao.getCloudStudyLivelyStudentNumData(dayStr), dayStr, IndexDataType.CLOUD_STUDY_LIVELY_STUDENT_NUM);
+			saveData(indexBaseMonthDataDao.getCloudStudyLivelyStudentNumData(dayStr,tenantId), dayStr, IndexDataType.CLOUD_STUDY_LIVELY_STUDENT_NUM);
 		}
 
 		//云教练新增人数
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.CLOUD_STUDY_NEW_STUDENT_NUM)) {
-			saveData(indexBaseMonthDataDao.getCloudStudyNewStudentNumData(dayStr), dayStr, IndexDataType.CLOUD_STUDY_NEW_STUDENT_NUM);
+			saveData(indexBaseMonthDataDao.getCloudStudyNewStudentNumData(dayStr,tenantId), dayStr, IndexDataType.CLOUD_STUDY_NEW_STUDENT_NUM);
 		}
 
 		//云教练新用户人数
@@ -583,7 +585,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		boolean specialType = IndexDataType.NEWLY_STUDENT_NUM.equals(indexDataType)||IndexDataType.QUIT_MUSIC_GROUP_STUDENT_NUM.equals(indexDataType);
 		Set<Integer> ignoreOrganIds = new HashSet<>();
 		if(specialType){
-			List<IndexBaseMonthData> indexBaseDatas = indexBaseMonthDataDao.getWithDayAndDataType(dayStr, indexDataType);
+			List<IndexBaseMonthData> indexBaseDatas = indexBaseMonthDataDao.getWithDayAndDataType(dayStr, indexDataType,TenantContextHolder.getTenantId());
 			if(!CollectionUtils.isEmpty(indexBaseDatas)) {
 				ignoreOrganIds = indexBaseDatas.stream().map(IndexBaseMonthData::getOrganId).collect(Collectors.toSet());
 			}
@@ -627,7 +629,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			classGroupIds = classGroupDao.queryGroupClassGroupIds(sysUser.getId());
 			educationUserId = sysUser.getId();
 		}
-
+		
 		if(IndexErrorType.MUSIC_PATROL.equals(errorType)){
 			IndexErrInfoDto<IndexErrInfoDto> one = new IndexErrInfoDto<>();
 			one.setErrorType(IndexErrorType.MUSIC_PATROL);
@@ -635,14 +637,14 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			List<IndexErrInfoDto> oneChild = new ArrayList<>();
 
 			//基础技能班学员数量异常
-			oneChild.add(new IndexErrInfoDto(IndexErrorType.HIGH_CLASS_STUDENT_LESS_THAN_THREE, IndexErrorType.HIGH_CLASS_STUDENT_LESS_THAN_THREE.getMsg(), indexBaseMonthDataDao.countLessThenThreeClassGroupNum(organIds,educationUserId), null));
+			oneChild.add(new IndexErrInfoDto(IndexErrorType.HIGH_CLASS_STUDENT_LESS_THAN_THREE, IndexErrorType.HIGH_CLASS_STUDENT_LESS_THAN_THREE.getMsg(), indexBaseMonthDataDao.countLessThenThreeClassGroupNum(organIds,educationUserId,tenantId), null));
 
 			//乐团巡查事项异常
-			int errInspection = indexBaseMonthDataDao.queryErrInspection(organIds,startTime);
+			int errInspection = indexBaseMonthDataDao.queryErrInspection(organIds,startTime,tenantId);
 			oneChild.add(new IndexErrInfoDto(IndexErrorType.MUSIC_PATROL_ITEM, IndexErrorType.MUSIC_PATROL_ITEM.getMsg(),errInspection, null));
 
 			//未加入任何班级学员
-			IndexErrInfoDto noClassMusicGroupStudentInfo = indexBaseMonthDataDao.getNoClassMusicGroupStudentInfo(organIds,educationUserId);
+			IndexErrInfoDto noClassMusicGroupStudentInfo = indexBaseMonthDataDao.getNoClassMusicGroupStudentInfo(organIds,educationUserId,tenantId);
 			noClassMusicGroupStudentInfo.setDesc(IndexErrorType.NO_CLASS_MUSIC_GROUP_STUDENT_INFO.getMsg());
 			oneChild.add(noClassMusicGroupStudentInfo);
 
@@ -662,16 +664,16 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			String studentErrorLeaveNum = sysTenantConfigService.getTenantConfigValue(SysConfigService.STUDENT_ERROR_LEAVE_NUM, tenantId);
 			if(StringUtils.isNotEmpty(studentErrorLeaveNum)){
 				String format1 = DateUtil.format(new Date(), DateUtil.ISO_YEAR_MONTH_FORMAT);
-				studentErrorLeave = indexBaseMonthDataDao.countStudentErrorLeave(organIds, format1, classGroupIds,Integer.parseInt(studentErrorLeaveNum));
+				studentErrorLeave = indexBaseMonthDataDao.countStudentErrorLeave(organIds, format1, classGroupIds,Integer.parseInt(studentErrorLeaveNum),tenantId);
 			}
 
 			twoChild.add(new IndexErrInfoDto(IndexErrorType.STUDENT_ERROR_LEAVE, IndexErrorType.STUDENT_ERROR_LEAVE.getMsg(),studentErrorLeave , null));
 
 			//未缴费学员数
-			twoChild.add(new IndexErrInfoDto(IndexErrorType.STUDENT_ARREARAGE, IndexErrorType.STUDENT_ARREARAGE.getMsg(), indexBaseMonthDataDao.countNoPaymentStudentNum(organIds,educationUserId,0), Arrays.asList(educationUserId)));
+			twoChild.add(new IndexErrInfoDto(IndexErrorType.STUDENT_ARREARAGE, IndexErrorType.STUDENT_ARREARAGE.getMsg(), indexBaseMonthDataDao.countNoPaymentStudentNum(organIds,educationUserId,0,tenantId), Arrays.asList(educationUserId)));
 
 			//申请退团学员数
-			List<Long> quitGroupNum = indexBaseMonthDataDao.queryApplyForQuitGroupNum(organIds,educationUserId);
+			List<Long> quitGroupNum = indexBaseMonthDataDao.queryApplyForQuitGroupNum(organIds,educationUserId,tenantId);
 			twoChild.add(new IndexErrInfoDto(IndexErrorType.STUDENT_APPLY_FOR_QUIT_MUSIC_GROUP, IndexErrorType.STUDENT_APPLY_FOR_QUIT_MUSIC_GROUP.getMsg(), quitGroupNum.size(),  quitGroupNum));
 
 			//乐团学员会员到期首页提醒
@@ -707,15 +709,15 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			}
 
 			//乐团巡查任务未计划
-			int inspectionItem = indexBaseMonthDataDao.queryInspectionItem(organIdsStr,startTime,userId);
+			int inspectionItem = indexBaseMonthDataDao.queryInspectionItem(organIdsStr,startTime,userId,tenantId);
 			threeChild.add(new IndexErrInfoDto(IndexErrorType.INSPECTION_ITEM, IndexErrorType.INSPECTION_ITEM.getMsg(),inspectionItem, null));
 
 			//乐团巡查任务未提交
-			int inspectionItemPlan = indexBaseMonthDataDao.queryInspectionItemPlan(organIdsStr,startTime);
+			int inspectionItemPlan = indexBaseMonthDataDao.queryInspectionItemPlan(organIdsStr,startTime,tenantId);
 			threeChild.add(new IndexErrInfoDto(IndexErrorType.INSPECTION_ITEM_PLAN, IndexErrorType.INSPECTION_ITEM_PLAN.getMsg(),inspectionItemPlan, null));
 
 			//回访任务未完成
-			int studentVisit = indexBaseMonthDataDao.queryStudentVisit(organIdsStr,startTime,userId);
+			int studentVisit = indexBaseMonthDataDao.queryStudentVisit(organIdsStr,startTime,userId,tenantId);
 			threeChild.add(new IndexErrInfoDto(IndexErrorType.STUDENT_VISIT, IndexErrorType.STUDENT_VISIT.getMsg(),studentVisit, null));
 
 			three.setNum(threeChild.stream().mapToInt(IndexErrInfoDto::getNum).sum());
@@ -735,12 +737,12 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			//课程时间安排异常
 			int courseTimeError = 0;
 			if(classGroupIds == null || classGroupIds.size() > 0){
-				attendanceError = indexBaseMonthDataDao.getAttendanceError(organIds,startTime,classGroupIds);
-				noAttendance = indexBaseMonthDataDao.getNoAttendance(organIds,startTime,classGroupIds);
+				attendanceError = indexBaseMonthDataDao.getAttendanceError(organIds,startTime,classGroupIds,tenantId);
+				noAttendance = indexBaseMonthDataDao.getNoAttendance(organIds,startTime,classGroupIds,tenantId);
 				String courseStartTimeError = sysTenantConfigService.getTenantConfigValue(SysConfigService.COURSE_START_TIME_ERROR, tenantId);
 				String courseEndTimeError = sysTenantConfigService.getTenantConfigValue(SysConfigService.COURSE_END_TIME_ERROR, tenantId);
 				if(StringUtils.isNotEmpty(courseStartTimeError) && StringUtils.isNotEmpty(courseEndTimeError)){
-					courseTimeError = indexBaseMonthDataDao.getCourseTimeError(organIds,classGroupIds,courseStartTimeError,courseEndTimeError);
+					courseTimeError = indexBaseMonthDataDao.getCourseTimeError(organIds,classGroupIds,courseStartTimeError,courseEndTimeError,tenantId);
 				}
 			}
 			fourChild.add(new IndexErrInfoDto(IndexErrorType.COURSE_TIME_ERROR, IndexErrorType.COURSE_TIME_ERROR.getMsg(), courseTimeError, null));
@@ -830,32 +832,34 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		Map<Integer, Integer> studentErrorLeaveMap = new HashMap<>();
 		//会员过期学员数
 		Map<Integer, Integer> noMemberStudentMap = new HashMap<>();
+		
+		Integer tenantId = TenantContextHolder.getTenantId();
 
 		if(IndexErrorType.MUSIC_PATROL.equals(errorType)||Objects.isNull(errorType)){
 			//基础技能班学员数量异常
-			List<Map<Integer, Integer>> highClassStudentLessThanThreeMapList = indexBaseMonthDataDao.countLessThenThreeClassOrganGroupNum(organIds, educationUserId);
+			List<Map<Integer, Integer>> highClassStudentLessThanThreeMapList = indexBaseMonthDataDao.countLessThenThreeClassOrganGroupNum(organIds, educationUserId, tenantId);
 			highClassStudentLessThanThreeMap = MapUtil.mapListToMap(highClassStudentLessThanThreeMapList, Integer.class, Integer.class);
 
 			//乐团巡查事项异常
-			List<Map<Integer, Integer>> musicPatrolItemMapList = indexBaseMonthDataDao.queryOrganErrInspection(organIds, startTime);
+			List<Map<Integer, Integer>> musicPatrolItemMapList = indexBaseMonthDataDao.queryOrganErrInspection(organIds, startTime, tenantId);
 			musicPatrolItemMap = MapUtil.mapListToMap(musicPatrolItemMapList, Integer.class, Integer.class);
 
 			//未加入任何班级学员
-			List<Map<Integer, Integer>> organNoClassMusicGroupStudentNumMapList = indexBaseMonthDataDao.getOrganNoClassMusicGroupStudentNum(organIds, educationUserId);
+			List<Map<Integer, Integer>> organNoClassMusicGroupStudentNumMapList = indexBaseMonthDataDao.getOrganNoClassMusicGroupStudentNum(organIds, educationUserId, tenantId);
 			organNoClassMusicGroupStudentNumMap = MapUtil.mapListToMap(organNoClassMusicGroupStudentNumMapList, Integer.class, Integer.class);
 		}
 
 		if(IndexErrorType.STUDENT_INFO.equals(errorType)||Objects.isNull(errorType)){
 			//学员异常请假数
-			List<Map<Integer, Integer>> studentErrorLeaveMapList = indexBaseMonthDataDao.countOrganStudentErrorLeave(organIds, classGroupIds);
+			List<Map<Integer, Integer>> studentErrorLeaveMapList = indexBaseMonthDataDao.countOrganStudentErrorLeave(organIds, classGroupIds, tenantId);
 			studentErrorLeaveMap = MapUtil.mapListToMap(studentErrorLeaveMapList, Integer.class, Integer.class);
 
 			//未缴费学员数
-			List<Map<Integer, Integer>> studentNotPaymentMapList = indexBaseMonthDataDao.countOrganNoPaymentStudentNum(organIds, educationUserId);
+			List<Map<Integer, Integer>> studentNotPaymentMapList = indexBaseMonthDataDao.countOrganNoPaymentStudentNum(organIds, educationUserId, tenantId);
 			studentNotPaymentMap = MapUtil.mapListToMap(studentNotPaymentMapList, Integer.class, Integer.class);
 
 			//申请退团学员数
-			List<Map<Integer, Integer>> studentApplyForQuitMusicGroupMapList = indexBaseMonthDataDao.queryOrganApplyForQuitGroupNum(organIds, educationUserId);
+			List<Map<Integer, Integer>> studentApplyForQuitMusicGroupMapList = indexBaseMonthDataDao.queryOrganApplyForQuitGroupNum(organIds, educationUserId, tenantId);
 			studentApplyForQuitMusicGroupMap = MapUtil.mapListToMap(studentApplyForQuitMusicGroupMapList, Integer.class, Integer.class);
 
 			//会员过期学员数
@@ -868,7 +872,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 
 			//全职未离职老师
 			//预计课酬较低
-			List<Map<Integer, Integer>> teacherExpectSalaryBeLowMapList = indexBaseMonthDataDao.queryOrganLowTeacherSalary(organIdsStr, monthStr);
+			List<Map<Integer, Integer>> teacherExpectSalaryBeLowMapList = indexBaseMonthDataDao.queryOrganLowTeacherSalary(organIdsStr, monthStr, tenantId);
 			teacherExpectSalaryBeLowMap = MapUtil.mapListToMap(teacherExpectSalaryBeLowMapList, Integer.class, Integer.class);
 
 			//课程时间安排异常
@@ -882,26 +886,26 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			}
 
 			//乐团巡查任务未计划
-			List<Map<Integer, Integer>> inspectionItemMapList = indexBaseMonthDataDao.queryOrganInspectionItem(organIdsStr, startTime, userId);
+			List<Map<Integer, Integer>> inspectionItemMapList = indexBaseMonthDataDao.queryOrganInspectionItem(organIdsStr, startTime, userId, tenantId);
 			inspectionItemMap = MapUtil.mapListToMap(inspectionItemMapList, Integer.class, Integer.class);
 
 			//乐团巡查任务未提交
-			List<Map<Integer, Integer>> inspectionItemPlanMapList = indexBaseMonthDataDao.queryOrganInspectionItemPlan(organIdsStr, startTime);
+			List<Map<Integer, Integer>> inspectionItemPlanMapList = indexBaseMonthDataDao.queryOrganInspectionItemPlan(organIdsStr, startTime, tenantId);
 			inspectionItemPlanMap = MapUtil.mapListToMap(inspectionItemPlanMapList, Integer.class, Integer.class);
 
 			//回访任务未完成
-			List<Map<Integer, Integer>> studentVisitMapList = indexBaseMonthDataDao.queryOrganStudentVisit(organIdsStr, startTime, userId);
+			List<Map<Integer, Integer>> studentVisitMapList = indexBaseMonthDataDao.queryOrganStudentVisit(organIdsStr, startTime, userId, tenantId);
 			studentVisitMap = MapUtil.mapListToMap(studentVisitMapList, Integer.class, Integer.class);
 		}
 
 		if(IndexErrorType.ATTENDANCE_SERVE.equals(errorType)||Objects.isNull(errorType)){
 			if(classGroupIds == null || classGroupIds.size() > 0){
 				//课程考勤异常
-				List<Map<Integer, Integer>> teacherExceptionAttendanceMapList = indexBaseMonthDataDao.getOrganAttendanceError(organIds, startTime, classGroupIds);
+				List<Map<Integer, Integer>> teacherExceptionAttendanceMapList = indexBaseMonthDataDao.getOrganAttendanceError(organIds, startTime, classGroupIds, tenantId);
 				teacherExceptionAttendanceMap = MapUtil.mapListToMap(teacherExceptionAttendanceMapList, Integer.class, Integer.class);
 
 				//课程异常
-				List<Map<Integer, Integer>> teacherNotAClassMapList = indexBaseMonthDataDao.getOrganNoAttendance(organIds, startTime, classGroupIds);
+				List<Map<Integer, Integer>> teacherNotAClassMapList = indexBaseMonthDataDao.getOrganNoAttendance(organIds, startTime, classGroupIds, tenantId);
 				teacherNotAClassMap = MapUtil.mapListToMap(teacherNotAClassMapList, Integer.class, Integer.class);
 			}
 
@@ -916,6 +920,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			params.put("jobNature", JobNatureEnum.FULL_TIME);
 			params.put("unDone",1);
 			params.put("reminded",0);
+			params.put("tenantId",TenantContextHolder.getTenantId());
 			List<Map<Integer, Integer>> teacherServeErrorMapList = indexBaseMonthDataDao.countOrganTeacherServeInfo(params);
 			teacherServeErrorMap = MapUtil.mapListToMap(teacherServeErrorMapList, Integer.class, Integer.class);
 		}
@@ -1072,12 +1077,12 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		result.add(indexErrInfoDto);
 
 		//未缴费学员数
-		result.add(new IndexErrInfoDto(IndexErrorType.STUDENT_NOT_PAYMENT, IndexErrorType.STUDENT_NOT_PAYMENT.getMsg(), indexBaseMonthDataDao.countNoPaymentStudentNum(organIdSet,educationUserId, 1), Arrays.asList(educationUserId)));
+		result.add(new IndexErrInfoDto(IndexErrorType.STUDENT_NOT_PAYMENT, IndexErrorType.STUDENT_NOT_PAYMENT.getMsg(), indexBaseMonthDataDao.countNoPaymentStudentNum(organIdSet,educationUserId, 1, tenantId), Arrays.asList(educationUserId)));
 
 		String monthStr = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
 		//全职未离职老师
 		//预计课酬较低
-		int lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIds,monthStr);
+		int lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIds,monthStr, tenantId);
 		result.add(new IndexErrInfoDto(IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW, IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW.getMsg(),lowTeacherSalary, null));
 
 		//乐团学员会员即将到期首页提醒
@@ -1128,18 +1133,18 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		}
 		Date date = new Date();
 		boolean flag1 = false;
-		int countLessThenThreeClassGroupNum = indexBaseMonthDataDao.countLessThenThreeClassGroupNum(organIds,educationUserId);
+		int countLessThenThreeClassGroupNum = indexBaseMonthDataDao.countLessThenThreeClassGroupNum(organIds,educationUserId, tenantId);
 		if(countLessThenThreeClassGroupNum > 0){
 			flag1 = true;
 		}
 		if(!flag1){
-			int errInspection = indexBaseMonthDataDao.queryErrInspection(organIds,startTime);
+			int errInspection = indexBaseMonthDataDao.queryErrInspection(organIds,startTime, tenantId);
 			if(errInspection > 0){
 				flag1 = true;
 			}
 		}
 		if(!flag1){
-			IndexErrInfoDto noClassMusicGroupStudentInfo = indexBaseMonthDataDao.getNoClassMusicGroupStudentInfo(organIds,educationUserId);
+			IndexErrInfoDto noClassMusicGroupStudentInfo = indexBaseMonthDataDao.getNoClassMusicGroupStudentInfo(organIds,educationUserId, tenantId);
 			if(Objects.nonNull(noClassMusicGroupStudentInfo) && noClassMusicGroupStudentInfo.getNum() > 0){
 				flag1 = true;
 			}
@@ -1152,21 +1157,21 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			String studentErrorLeaveNum = sysTenantConfigService.getTenantConfigValue(SysConfigService.STUDENT_ERROR_LEAVE_NUM, tenantId);
 			if(StringUtils.isNotEmpty(studentErrorLeaveNum)){
 				String format1 = DateUtil.format(new Date(), DateUtil.ISO_YEAR_MONTH_FORMAT);
-				studentErrorLeave = indexBaseMonthDataDao.countStudentErrorLeave(organIds, format1, classGroupIds,Integer.parseInt(studentErrorLeaveNum));
+				studentErrorLeave = indexBaseMonthDataDao.countStudentErrorLeave(organIds, format1, classGroupIds,Integer.parseInt(studentErrorLeaveNum), tenantId);
 			}
 			if(studentErrorLeave > 0){
 				flag2 = true;
 			}
 		}
 		if(!flag2){
-			List<Long> quitGroupNum = indexBaseMonthDataDao.queryApplyForQuitGroupNum(organIds,educationUserId);
+			List<Long> quitGroupNum = indexBaseMonthDataDao.queryApplyForQuitGroupNum(organIds,educationUserId, tenantId);
 			if(quitGroupNum.size() > 0){
 				flag2 = true;
 			}
 		}
 
 		if(!flag2){
-			int countNoPaymentStudentNum = indexBaseMonthDataDao.countNoPaymentStudentNum(organIds,educationUserId, 0);
+			int countNoPaymentStudentNum = indexBaseMonthDataDao.countNoPaymentStudentNum(organIds,educationUserId, 0, tenantId);
 			if(countNoPaymentStudentNum > 0){
 				flag2 = true;
 			}
@@ -1191,19 +1196,19 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		}
 
 		if(!flag3){
-			int inspectionItem = indexBaseMonthDataDao.queryInspectionItem(organIdsStr,startTime,userId);
+			int inspectionItem = indexBaseMonthDataDao.queryInspectionItem(organIdsStr,startTime,userId, tenantId);
 			if(inspectionItem > 0){
 				flag3 = true;
 			}
 		}
 		if(!flag3){
-			int inspectionItemPlan = indexBaseMonthDataDao.queryInspectionItemPlan(organIdsStr,startTime);
+			int inspectionItemPlan = indexBaseMonthDataDao.queryInspectionItemPlan(organIdsStr,startTime, tenantId);
 			if(inspectionItemPlan > 0){
 				flag3 = true;
 			}
 		}
 		if(!flag3){
-			int studentVisit = indexBaseMonthDataDao.queryStudentVisit(organIdsStr,startTime,userId);
+			int studentVisit = indexBaseMonthDataDao.queryStudentVisit(organIdsStr,startTime,userId, tenantId);
 			if(studentVisit > 0){
 				flag3 = true;
 			}
@@ -1217,7 +1222,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 				String courseStartTimeError = sysTenantConfigService.getTenantConfigValue(SysConfigService.COURSE_START_TIME_ERROR, tenantId);
 				String courseEndTimeError = sysTenantConfigService.getTenantConfigValue(SysConfigService.COURSE_END_TIME_ERROR, tenantId);
 				if(StringUtils.isNotEmpty(courseStartTimeError) && StringUtils.isNotEmpty(courseEndTimeError)){
-					courseTimeError = indexBaseMonthDataDao.getCourseTimeError(organIds,classGroupIds,courseStartTimeError,courseEndTimeError);
+					courseTimeError = indexBaseMonthDataDao.getCourseTimeError(organIds,classGroupIds,courseStartTimeError,courseEndTimeError, tenantId);
 				}
 			}
 			if(courseTimeError > 0){
@@ -1227,7 +1232,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		if(!flag4){
 			int attendanceError = 0;
 			if(classGroupIds == null || classGroupIds.size() > 0){
-				attendanceError = indexBaseMonthDataDao.getAttendanceError(organIds,startTime,classGroupIds);
+				attendanceError = indexBaseMonthDataDao.getAttendanceError(organIds,startTime,classGroupIds, tenantId);
 			}
 			if(attendanceError > 0){
 				flag4 = true;
@@ -1236,7 +1241,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		if(!flag4){
 			int noAttendance = 0;
 			if(classGroupIds == null || classGroupIds.size() > 0){
-				noAttendance = indexBaseMonthDataDao.getNoAttendance(organIds,startTime,classGroupIds);
+				noAttendance = indexBaseMonthDataDao.getNoAttendance(organIds,startTime,classGroupIds, tenantId);
 			}
 			if(noAttendance > 0){
 				flag4 = true;
@@ -1263,13 +1268,13 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		boolean flag5 = false;
 		if(!flag5){
 			String monthStr = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
-			int lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
+			int lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr, tenantId);
 			if(lowTeacherSalary > 0){
 				flag5 = true;
 			}
 		}
 		if(!flag5){
-			int countNoPaymentStudentNum = indexBaseMonthDataDao.countNoPaymentStudentNum(organIds,educationUserId, 1);
+			int countNoPaymentStudentNum = indexBaseMonthDataDao.countNoPaymentStudentNum(organIds,educationUserId, 1, tenantId);
 			if(countNoPaymentStudentNum > 0){
 				flag5 = true;
 			}
@@ -1314,7 +1319,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			add(ORGAN_TOTAL_STUDENT_NUM.getCode());add(CLOUD_STUDY_NEW_STUDENT_NUM.getCode());add(CLOUD_STUDY_DAY_USE_STUDENT_NUM.getCode());}};
 
 
-		List<IndexBaseMonthData> indexBaseDatas = indexBaseMonthDataDao.getAllIndexBaseData(new HashSet<>(organIds), dataTypes, queryInfo.getDate(), queryInfo.getDate());
+		List<IndexBaseMonthData> indexBaseDatas = indexBaseMonthDataDao.getAllIndexBaseData(new HashSet<>(organIds), dataTypes, queryInfo.getDate(), queryInfo.getDate(), queryInfo.getTenantId());
 
 		Map<Integer, Integer> organsStudentNumMap = indexBaseDatas.stream().filter(i->ORGAN_TOTAL_STUDENT_NUM.equals(i.getDataType())).collect(Collectors.toMap(IndexBaseMonthData::getOrganId, i->i.getActivateNum().intValue(), (i1, i2)->i1));
 

+ 8 - 16
mec-biz/src/main/java/com/ym/mec/biz/service/impl/IndexErrDataRecordServiceImpl.java

@@ -21,11 +21,15 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
+
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.biz.service.IndexErrDataRecordService;
+
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
@@ -74,8 +78,10 @@ public class IndexErrDataRecordServiceImpl extends BaseServiceImpl<Long, IndexEr
 			date = LocalDate.now().plusDays(-1).toString();
 		}
 		Date dt = DateUtil.stringToDate(date, "yyyy-MM-dd");
+		
+		Integer tenantId = TenantContextHolder.getTenantId();
 
-		int errDateNum = indexErrDataRecordDao.countWithGenerateTime(date);
+		int errDateNum = indexErrDataRecordDao.countWithGenerateTime(date, tenantId);
 
 		if(errDateNum<=0){
 			//乐团巡查事项异常
@@ -178,27 +184,13 @@ public class IndexErrDataRecordServiceImpl extends BaseServiceImpl<Long, IndexEr
 	}
 
 	@Override
-	public List<SimpleUserDto> getAllEducationUsers(String organIds) {
-		Set<Integer> queryOrganIds = null;
-		if(StringUtils.isNotBlank(organIds)){
-			queryOrganIds = Arrays.stream(organIds.split(",")).map(Integer::new).collect(Collectors.toSet());
-		}
-		List<Integer> allDealUserIds = indexErrDataRecordDao.getAllDealUserIds(queryOrganIds);
-		List<SimpleUserDto> users = new ArrayList<>();
-		if(!CollectionUtils.isEmpty(allDealUserIds)){
-			users = teacherDao.getUsersSimpleInfo(allDealUserIds);
-		}
-		return users;
-	}
-
-	@Override
 	public List<IndexErrorDataExportDto> errRecordExport(String organIdsStr, String startDate, String endDate) {
 		List<IndexErrorDataExportDto> result = new ArrayList<>();
 		Set<Integer> queryOrganIds = null;
 		if(StringUtils.isNotBlank(organIdsStr)){
 			queryOrganIds = Arrays.stream(organIdsStr.split(",")).map(Integer::new).collect(Collectors.toSet());
 		}
-		List<IndexErrDataRecord> errRecords = indexErrDataRecordDao.getWithGenerateTime(queryOrganIds, startDate, endDate);
+		List<IndexErrDataRecord> errRecords = indexErrDataRecordDao.getWithGenerateTime(queryOrganIds, startDate, endDate, TenantContextHolder.getTenantId());
 		if(CollectionUtils.isEmpty(errRecords)){
 			return result;
 		}

+ 2 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentServiceImpl.java

@@ -844,7 +844,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         if(!CollectionUtils.isEmpty(organsNewCloudStudyNumMapList)){
             organsNewCloudStudyNumMap = MapUtil.convertIntegerMap(organsNewCloudStudyNumMapList);
         }
-        List<IndexBaseMonthData> withDayAndDataType = indexBaseMonthDataDao.getWithDayAndDataType(LocalDate.now().toString(), CLOUD_NEW_STUDENT_NUM);
+        List<IndexBaseMonthData> withDayAndDataType = indexBaseMonthDataDao.getWithDayAndDataType(LocalDate.now().toString(), CLOUD_NEW_STUDENT_NUM, TenantContextHolder.getTenantId());
         Map<Integer, Integer> organsNewCloudNewStudentNumMap = withDayAndDataType.stream().collect(Collectors.toMap(IndexBaseMonthData::getOrganId, e -> e.getActivateNum().intValue(), (e1, e2) -> e1));
 
         Integer tenantId = TenantContextHolder.getTenantId();
@@ -956,7 +956,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             organsNewCloudStudyNumMap = MapUtil.convertIntegerMap(organsNewCloudStudyNumMapList);
         }
 
-        List<IndexBaseMonthData> withDayAndDataType = indexBaseMonthDataDao.getWithDayAndDataType(LocalDate.now().toString(), CLOUD_NEW_STUDENT_NUM);
+        List<IndexBaseMonthData> withDayAndDataType = indexBaseMonthDataDao.getWithDayAndDataType(LocalDate.now().toString(), CLOUD_NEW_STUDENT_NUM, queryInfo.getTenantId());
         Map<Integer, Integer> organsNewCloudNewStudentNumMap = withDayAndDataType.stream().collect(Collectors.toMap(IndexBaseMonthData::getOrganId, e -> e.getActivateNum().intValue(), (e1, e2) -> e1));
 
         List<EduOrganStudentDataDto> result = new ArrayList<>();

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/ChargeTypeMapper.xml

@@ -72,7 +72,7 @@
         FROM (SELECT * FROM charge_type WHERE del_flag_ = 0 <include refid="global.limit"/>) ct
         LEFT JOIN charge_type_subject_mapper ctsm ON ct.id_ = ctsm.charge_type_id_
         LEFT JOIN `subject` s ON ctsm.subject_id_ = s.id_
-        where tenant_id_ = #{tenantId}
+        where ct.tenant_id_ = #{tenantId}
         ORDER BY ct.update_time_
     </select>
 

+ 6 - 9
mec-biz/src/main/resources/config/mybatis/HfMemberMapper.xml

@@ -26,6 +26,7 @@
         <result column="route_organ_id_" property="routeOrganId"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+		<result column="tenant_id_" property="tenantId" />
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
@@ -33,7 +34,7 @@
         business_scope_, legal_person_, legal_cert_id_, legal_cert_id_expires_, legal_mp_,
         address_, zip_code_, card_no_,
         bank_code_,settle_account_id_,status_,month_max_receipt_,route_member_id_,route_organ_id_, create_time_,
-        update_time_
+        update_time_,tenant_id_
     </sql>
     <select id="get" parameterType="java.lang.Integer" resultMap="hfMember">
         <!--@mbg.generated-->
@@ -55,13 +56,13 @@
         business_scope_, legal_person_, legal_cert_id_,
         legal_cert_id_expires_, legal_mp_, address_,
         zip_code_, card_no_, bank_code_,status_,
-        create_time_, update_time_)
+        create_time_, update_time_,tenant_id_)
         values (#{name}, #{memberId}, #{provCode},
         #{areaCode}, #{socialCreditCode}, #{socialCreditCodeExpires},
         #{businessScope}, #{legalPerson}, #{legalCertId},
         #{legalCertIdExpires}, #{legalMp}, #{address},
         #{zipCode}, #{cardNo}, #{bankCode},#{status},
-        #{createTime}, #{updateTime})
+        #{createTime}, #{updateTime},#{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.HfMember">
         <!--@mbg.generated-->
@@ -137,7 +138,7 @@
                 update_time_ = #{updateTime},
             </if>
         </set>
-        where id_ = #{id,jdbcType=INTEGER}
+        where id_ = #{id,jdbcType=INTEGER} and tenant_id_ = #{tennatId}
     </update>
 
     <!-- 分页查询 -->
@@ -150,6 +151,7 @@
 
     <sql id="queryPageSql">
         <where>
+        	tenant_id_ = #{tenantId}
             <if test="name != null">
                 AND name_ LIKE CONCAT( '%', #{name}, '%' )
             </if>
@@ -182,9 +184,4 @@
         LIMIT 1
     </select>
 
-    <select id="getNeedRouteMerNos" resultMap="hfMember">
-        SELECT *
-        FROM hf_member
-        WHERE month_max_receipt_ > 0
-    </select>
 </mapper>

+ 21 - 20
mec-biz/src/main/resources/config/mybatis/HotWordsLabelMapper.xml

@@ -12,6 +12,7 @@
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="del_flag_" property="delFlag" />
+		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -21,7 +22,7 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="HotWordsLabel">
-		SELECT * FROM hot_words_label ORDER BY id_
+		SELECT * FROM hot_words_label where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -31,28 +32,28 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO hot_words_label (id_,name_,create_time_,update_time_,del_flag_) VALUES(#{id},#{name},#{createTime},NOW(),#{delFlag})
+		INSERT INTO hot_words_label (id_,name_,create_time_,update_time_,del_flag_,tenant_id_) VALUES(#{id},#{name},#{createTime},NOW(),#{delFlag},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.HotWordsLabel">
 		UPDATE hot_words_label <set>
-<if test="delFlag != null">
-del_flag_ = #{delFlag},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="updateTime != null">
-update_time_ = NOW(),
-</if>
-<if test="name != null">
-name_ = #{name},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
+		<if test="delFlag != null">
+		del_flag_ = #{delFlag},
+		</if>
+		<if test="id != null">
+		id_ = #{id},
+		</if>
+		<if test="updateTime != null">
+		update_time_ = NOW(),
+		</if>
+		<if test="name != null">
+		name_ = #{name},
+		</if>
+		<if test="createTime != null">
+		create_time_ = #{createTime},
+		</if>
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -62,11 +63,11 @@ create_time_ = #{createTime},
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="HotWordsLabel" parameterType="map">
-		SELECT * FROM hot_words_label ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM hot_words_label where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM hot_words_label
+		SELECT COUNT(*) FROM hot_words_label where tenant_id_ = #{tenantId}
 	</select>
 </mapper>

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

@@ -19,6 +19,7 @@
 		<result column="order_type_" property="orderType"/>
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -28,7 +29,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="IndexBaseMonthData">
-		SELECT * FROM index_base_month_data ORDER BY id_
+		SELECT * FROM index_base_month_data where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<select id="getOrganDataWithDayAndDataType" resultMap="IndexBaseMonthData">
@@ -42,25 +43,25 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO index_base_month_data (month_,organ_id_,total_num_,activate_num_,percent_,data_type_,extend_info_,create_time_,update_time_)
-		VALUES(#{month},#{organId},#{totalNum},#{activateNum},#{percent},#{dataType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{extendInfo},NOW(),NOW())
+		INSERT INTO index_base_month_data (month_,organ_id_,total_num_,activate_num_,percent_,data_type_,extend_info_,create_time_,update_time_,tenant_id_)
+		VALUES(#{month},#{organId},#{totalNum},#{activateNum},#{percent},#{dataType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{extendInfo},NOW(),NOW(),#{tenantId})
 	</insert>
 
 	<insert id="batchInsertWithDataType" parameterType="com.ym.mec.biz.dal.entity.IndexBaseMonthData" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO index_base_month_data (month_,organ_id_,total_num_,activate_num_,percent_,data_type_,extend_info_,create_time_,update_time_)
+		INSERT INTO index_base_month_data (month_,organ_id_,total_num_,activate_num_,percent_,data_type_,extend_info_,create_time_,update_time_,tenant_id_)
 		VALUES
 		<foreach collection="datas" item="data" separator=",">
 			(#{data.month},#{data.organId},#{data.totalNum},#{data.activateNum},#{data.percent},
-			#{dataType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{data.extendInfo},NOW(),NOW())
+			#{dataType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{data.extendInfo},NOW(),NOW(),#{tenantId})
 		</foreach>
 	</insert>
 
 	<insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.IndexBaseMonthData" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO index_base_month_data (month_,organ_id_,total_num_,activate_num_,percent_,data_type_,extend_info_,create_time_,update_time_)
+		INSERT INTO index_base_month_data (month_,organ_id_,total_num_,activate_num_,percent_,data_type_,extend_info_,create_time_,update_time_,tenant_id_)
 		VALUES
 		<foreach collection="datas" item="data" separator=",">
 			(#{data.month},#{data.organId},#{data.totalNum},#{data.activateNum},#{data.percent},
-			#{data.dataType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{data.extendInfo},NOW(),NOW())
+			#{data.dataType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{data.extendInfo},NOW(),NOW(),#{tenantId})
 		</foreach>
 	</insert>
 
@@ -94,7 +95,7 @@
 			</if>
 			update_time_ = NOW()
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -115,12 +116,12 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="IndexBaseMonthData" parameterType="map">
-		SELECT * FROM index_base_month_data ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM index_base_month_data where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM index_base_month_data
+		SELECT COUNT(*) FROM index_base_month_data where tenant_id_ = #{tenantId}
 	</select>
 
     <select id="getIndexBaseData" resultMap="IndexBaseMonthData">
@@ -128,6 +129,7 @@
 			month_,data_type_,SUM(total_num_) total_num_,SUM(activate_num_) activate_num_,SUM(percent_) percent_
 		FROM index_base_month_data
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="dataTypes!=null and dataTypes.size()>0">
 				AND data_type_ IN
 				<foreach collection="dataTypes" item="dataType" open="(" close=")" separator=",">
@@ -155,6 +157,7 @@
 			*
 		FROM index_base_month_data
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="dataTypes!=null and dataTypes.size()>0">
 				AND data_type_ IN
 				<foreach collection="dataTypes" item="dataType" open="(" close=")" separator=",">
@@ -185,6 +188,7 @@
 		FROM index_base_month_data
 		FORCE INDEX(data_type_, month_)
 			<where>
+				tenant_id_ = #{tenantId}
 				<if test="dataTypes!=null and dataTypes.size()>0">
 					AND data_type_ IN
 					<foreach collection="dataTypes" item="dataType" open="(" close=")" separator=",">
@@ -211,7 +215,7 @@
 		SELECT
 			*
 		FROM index_base_month_data
-		WHERE 1=1
+		WHERE tenant_id_ = #{tenantId}
 			AND data_type_ = #{dataType}
 			AND month_&gt;=#{day}
 	</select>
@@ -252,7 +256,7 @@
 			)) u
 			LEFT JOIN sys_user su ON u.user_id_ = su.id_
 		WHERE
-			del_flag_=0
+			del_flag_=0 and su.tenant_id_ = #{tenantId}
 		  	AND organ_id_ IS NOT NULL
 			AND user_type_ LIKE '%STUDENT%'
 		GROUP BY organ_id_
@@ -270,7 +274,7 @@
 			student stu
 			LEFT JOIN sys_user su ON stu.user_id_=su.id_
 		WHERE
-			su.del_flag_=0
+			su.del_flag_=0 and su.tenant_id_ = #{tenantId}
 		  AND su.organ_id_ IS NOT NULL
 		  AND su.user_type_ LIKE '%STUDENT%'
 		  AND DATE_FORMAT(stu.create_time_, '%Y-%m-%d')&lt;=#{dayStr}
@@ -289,7 +293,7 @@
 			student stu
 			LEFT JOIN sys_user su ON stu.user_id_=su.id_
 		WHERE
-			su.del_flag_=0
+			su.del_flag_=0 and su.tenant_id_ = #{tenantId}
 		  AND su.organ_id_ IS NOT NULL
 		  AND su.user_type_ LIKE '%STUDENT%'
 		  AND DATE_FORMAT(stu.create_time_, '%Y-%m-%d')=#{dayStr}
@@ -309,7 +313,7 @@
 			LEFT JOIN sys_user su ON stu.user_id_=su.id_
 			LEFT JOIN student_payment_order spo ON stu.user_id_=spo.user_id_ AND status_='SUCCESS' AND actual_amount_>0
 		WHERE
-			su.del_flag_=0
+			su.del_flag_=0 and su.tenant_id_ = #{tenantId}
 			  AND su.organ_id_ IS NOT NULL
 			  AND su.user_type_ LIKE '%STUDENT%'
 			  AND DATE_FORMAT(stu.create_time_, '%Y-%m-%d')&lt;=#{dayStr}
@@ -341,7 +345,7 @@
 		FROM student_extracurricular_exercises_situation_ sees
 		LEFT JOIN sys_user su ON sees.student_id_=su.id_
 		LEFT JOIN teacher tea ON sees.teacher_id_=tea.id_
-		WHERE su.del_flag_=0
+		WHERE su.del_flag_=0 and su.tenant_id_ = #{tenantId}
 		  	AND tea.job_nature_='FULL_TIME'
 			AND su.organ_id_ IS NOT NULL
 			AND DATE_FORMAT(sees.monday_, '%Y-%m-%d')&lt;=#{dayStr}
@@ -360,7 +364,7 @@
 		FROM
 			music_group mg
 		WHERE
-			mg.del_flag_ = 0
+			mg.del_flag_ = 0 and mg.tenant_id_ = #{tenantId}
 			AND mg.organ_id_ IS NOT NULL
 			AND mg.status_ = 'PROGRESS'
 			AND DATE_FORMAT(mg.create_time_, '%Y-%m-%d')&lt;=#{dayStr}
@@ -379,7 +383,7 @@
 		FROM
 			music_group
 		WHERE
-			del_flag_ = 0
+			del_flag_ = 0 and tenant_id_ = #{tenantId}
 			AND status_ = 'PROGRESS'
 			AND organ_id_ IS NOT NULL
 			<if test="dayStr!=null and dayStr!=''">
@@ -400,7 +404,7 @@
 		FROM student_registration sr
 			LEFT JOIN music_group mg ON sr.music_group_id_=mg.id_
 		WHERE
-			mg.del_flag_ = 0
+			mg.del_flag_ = 0 and mg.tenant_id_ = #{tenantId}
 		  	AND mg.organ_id_ IS NOT NULL
 			AND mg.status_ = 'PROGRESS'
 			<if test="type==null">
@@ -434,7 +438,7 @@
 			teacher t
 			LEFT JOIN sys_user su ON su.id_ = t.id_
 		WHERE
-			su.del_flag_ = 0
+			su.del_flag_ = 0 and t.tenant_id_ = #{tenantId}
 		  	AND (t.demission_date_ IS NULl OR DATE_FORMAT(t.demission_date_, '%Y-%m-%d') &gt; #{dayStr})
 		  	<if test="isDemission==null">
 				AND su.lock_flag_ = 0
@@ -470,7 +474,7 @@
 		  	AND m.status_ = #{courseStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			AND (m.new_course_id_ IS NULL OR m.new_course_id_=m.id_)
 			AND NOT EXISTS (SELECT id_ FROM practice_group WHERE m.group_type_='PRACTICE' AND m.music_group_id_=id_ AND type_='TRIAL')
-			AND m.organ_id_ IS NOT NULL AND m.pre_course_flag_ = 0
+			AND m.organ_id_ IS NOT NULL AND m.pre_course_flag_ = 0 and m.tenant_id_ = #{tenantId}
 			<if test="groupType!=null">
 				AND m.group_type_ = #{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>
@@ -493,7 +497,7 @@
 		FROM
 			course_schedule m
 		WHERE
-			m.del_flag_ = 0
+			m.del_flag_ = 0 and m.tenant_id_ = #{tenantId}
 			AND (m.is_lock_ = 0 OR m.is_lock_ IS NULL)
 			AND m.status_ = #{courseStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			AND (m.new_course_id_ IS NULL OR m.new_course_id_=m.id_)
@@ -519,7 +523,7 @@
 		FROM
 		course_schedule m
 		WHERE
-		m.del_flag_ = 0
+		m.del_flag_ = 0 and m.tenant_id_ = #{tenantId}
 		AND (m.is_lock_ = 0 OR m.is_lock_ IS NULL)
 		AND (m.new_course_id_ IS NULL OR m.new_course_id_=m.id_)
 		AND NOT EXISTS (SELECT id_ FROM practice_group WHERE m.group_type_='PRACTICE' AND m.music_group_id_=id_ AND type_='TRIAL')
@@ -562,7 +566,7 @@
 		LEFT JOIN vip_group vg ON m.music_group_id_=vg.id_
 		LEFT JOIN vip_group_category vgc ON vg.vip_group_category_id_=vgc.id_
 		WHERE
-		m.del_flag_ = 0
+		m.del_flag_ = 0 and m.tenant_id_ = #{tenantId}
 		AND (m.is_lock_ = 0 OR m.is_lock_ IS NULL)
 		AND (m.new_course_id_ IS NULL OR m.new_course_id_=m.id_)
 		AND m.organ_id_ IS NOT NULL
@@ -602,7 +606,7 @@
 			LEFT JOIN course_schedule_student_payment s ON su.id_=s.user_id_
 			LEFT JOIN course_schedule m ON s.course_schedule_id_=m.id_
 		WHERE
-			m.del_flag_ = 0
+			m.del_flag_ = 0 and m.tenant_id_ = #{tenantId}
 			AND (m.is_lock_ = 0 OR m.is_lock_ IS NULL)
 			AND su.organ_id_ IS NOT NULL
 			AND m.group_type_ IN ('VIP', 'PRACTICE')
@@ -629,7 +633,7 @@
 			LEFT JOIN course_schedule_student_payment cssp1 ON s.user_id_=cssp1.user_id_ AND cssp1.create_time_&lt;#{dayStr}
 			LEFT JOIN course_schedule m ON s.course_schedule_id_=m.id_
 		WHERE
-			m.del_flag_ = 0
+			m.del_flag_ = 0 and m.tenant_id_ = #{tenantId}
 			AND (m.is_lock_ = 0 OR m.is_lock_ IS NULL)
 			AND cssp1.id_ IS NULL
 			AND su.organ_id_ IS NOT NULL
@@ -654,7 +658,7 @@
 			LEFT JOIN practice_group pg ON m.music_group_id_=pg.id_ AND m.group_type_='PRACTICE'
 		WHERE
 			(cs.del_flag_ IS NULL OR cs.del_flag_=0)
-			AND cs.organ_id_ IS NOT NULL
+			AND cs.organ_id_ IS NOT NULL and cs.tenant_id_ = #{tenantId}
 			AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
 			AND m.group_type_ IN ('VIP', 'PRACTICE')
 			AND (pg.id_ IS NULL OR pg.type_='CHARGE')
@@ -680,7 +684,7 @@
 			student_pre_registration spr
 			LEFT JOIN music_group mg ON spr.music_group_id_ = mg.id_
 		WHERE
-			mg.del_flag_ = 0
+			mg.del_flag_ = 0 and mg.tenant_id_ = #{tenantId}
 			AND mg.organ_id_ IS NOT NULL
 		  	AND mg.status_ = 'PROGRESS'
 			AND DATE_FORMAT( spr.create_time_, '%Y-%m-%d' ) &lt;= #{dayStr}
@@ -702,7 +706,7 @@
 			LEFT JOIN student_pre_registration spr ON sr.user_id_ = spr.user_id_ AND sr.music_group_id_ = spr.music_group_id_
 			LEFT JOIN music_group mg ON spr.music_group_id_ = mg.id_
 		WHERE
-			mg.del_flag_ = 0
+			mg.del_flag_ = 0 and mg.tenant_id_ = #{tenantId}
 			AND mg.organ_id_ IS NOT NULL
 			AND mg.status_ = 'PROGRESS'
 			<if test="paymentStatus==null">
@@ -727,7 +731,7 @@
 			LEFT JOIN student_pre_registration spr ON sr.user_id_ = spr.user_id_ AND sr.music_group_id_ = spr.music_group_id_
 			LEFT JOIN music_group mg ON spr.music_group_id_ = mg.id_
 		WHERE
-			mg.del_flag_ = 0
+			mg.del_flag_ = 0 and mg.tenant_id_ = #{tenantId}
 			AND mg.organ_id_ IS NOT NULL
 			AND mg.status_ = 'PROGRESS'
 			<if test="paymentStatus==null">
@@ -748,7 +752,7 @@
 		LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
 		LEFT JOIN course_schedule cs ON cs.class_group_id_=cg.id_
 		WHERE
-		cg.type_ IN ('HIGH', 'HIGH_ONLINE')
+		cg.type_ IN ('HIGH', 'HIGH_ONLINE') and cg.tenant_id_ = #{tenantId}
 		AND mg.status_ = 'PROGRESS' AND cg.del_flag_ = 0 AND cs.pre_course_flag_ = 0
 		AND cs.del_flag_=0
 		AND cs.status_='NOT_START'
@@ -778,7 +782,7 @@
 		LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
 		LEFT JOIN course_schedule cs ON cs.class_group_id_=cg.id_
 		WHERE
-		cg.type_ IN ('HIGH', 'HIGH_ONLINE') AND cs.pre_course_flag_ = 0
+		cg.type_ IN ('HIGH', 'HIGH_ONLINE') AND cs.pre_course_flag_ = 0 and cg.tenant_id_ = #{tenantId}
 		AND mg.status_ = 'PROGRESS' AND cg.del_flag_ = 0
 		AND cs.del_flag_=0
 		AND cs.status_='NOT_START'
@@ -804,7 +808,7 @@
 		LEFT JOIN class_group_student_mapper cgsm ON cg.id_ = cgsm.class_group_id_
 		LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
 		WHERE
-		cg.type_ IN ('HIGH_ONLINE')
+		cg.type_ IN ('HIGH_ONLINE') and cg.tenant_id_ = #{tenantId}
 		AND mg.status_ = 'PROGRESS' AND cg.del_flag_ = 0
 		<if test="organIds!=null and organIds.size()>0">
 			AND mg.organ_id_ IN
@@ -826,7 +830,7 @@
 		LEFT JOIN music_group mg ON mgpc.music_group_id_ = mg.id_
 		LEFT JOIN student_registration sr ON sr.music_group_id_ = mgpc.music_group_id_ AND mgpcd.user_id_ = sr.user_id_
 		WHERE
-		mg.status_ = 'PROGRESS'
+		mg.status_ = 'PROGRESS' and mg.tenant_id_ = #{tenantId}
 		AND ((mgpc.member_rank_setting_id_ IS NOT NULL AND (sr.membership_end_time_ &lt; NOW() OR sr.membership_end_time_ IS NULL)) OR mgpc.member_rank_setting_id_ IS NULL)
 		<if test="noPaymentType==null or noPaymentType==0">
 			AND DATE_FORMAT(NOW(),'%Y-%m-%d') > DATE_FORMAT(mgpc.deadline_payment_date_,'%Y-%m-%d')
@@ -856,7 +860,7 @@
 		LEFT JOIN music_group_payment_calender mgpc ON mgpcd.music_group_payment_calender_id_ = mgpc.id_
 		LEFT JOIN music_group mg ON mgpc.music_group_id_ = mg.id_
 		WHERE
-		mg.status_ = 'PROGRESS'
+		mg.status_ = 'PROGRESS' and mg.tenant_id_ = #{tenantId}
 		AND DATE_FORMAT(NOW(),'%Y-%m-%d') > mgpc.deadline_payment_date_
 		AND mgpcd.payment_status_ = 'NON_PAYMENT' AND mgpcd.expect_amount_ > 0 AND mgpc.batch_no_ IS NOT NULL AND mgpc.pay_user_type_ = 'STUDENT'
 		<if test="educationUserId != null">
@@ -879,7 +883,7 @@
 			LEFT JOIN music_group_payment_calender mgpc ON mgpcd.music_group_payment_calender_id_ = mgpc.id_
 			LEFT JOIN music_group mg ON mgpc.music_group_id_ = mg.id_
 		WHERE
-			mg.status_ = 'PROGRESS'
+			mg.status_ = 'PROGRESS' and mg.tenant_id_ = #{tenantId}
 			AND DATE_FORMAT(NOW(),'%Y-%m-%d') >= DATE_FORMAT(mgpc.payment_valid_start_date_,'%Y-%m-%d')
 			AND mgpcd.payment_status_ = 'NON_PAYMENT'
 			<if test="educationUserId != null">
@@ -897,7 +901,7 @@
 		SELECT mgq.id_ FROM music_group_quit mgq
 			LEFT JOIN music_group mg ON mgq.music_group_id_=mg.id_
 		WHERE mg.status_='PROGRESS'
-		  AND mgq.status_='PROCESSING'
+		  AND mgq.status_='PROCESSING' and mgq.tenant_id_ = #{tenantId}
 		<if test="educationUserId != null">
 			AND mg.educational_teacher_id_ = #{educationUserId}
 		</if>
@@ -916,7 +920,7 @@
 		FROM music_group_quit mgq
 		LEFT JOIN music_group mg ON mgq.music_group_id_=mg.id_
 		WHERE mg.status_='PROGRESS'
-		AND mgq.status_='PROCESSING'
+		AND mgq.status_='PROCESSING' mgq.and tenant_id_ = #{tenantId}
 		<if test="educationUserId != null">
 			AND mg.educational_teacher_id_ = #{educationUserId}
 		</if>
@@ -939,7 +943,7 @@
 			LEFT JOIN student_visit sv ON cssp.id_ = sv.object_id_
 		WHERE
 				cs.status_ = 'OVER' AND sv.id_ IS NULL AND cs.del_flag_ = 0 AND cs.class_date_ >= #{startTime} AND cs.class_date_ &lt;= DATE_FORMAT(NOW(),'%Y-%m-%d')
-				AND cssp.group_type_ IN ('MUSIC','PRACTICE','VIP') AND cs.pre_course_flag_ = 0
+				AND cssp.group_type_ IN ('MUSIC','PRACTICE','VIP') AND cs.pre_course_flag_ = 0 and cssp.tenant_id_ = #{tenantId}
 			<if test="type!=null and type=='LEAVE'">
 				AND sa.status_ = 'LEAVE'
 			</if>
@@ -956,7 +960,7 @@
     <select id="getCourseTimeError" resultType="int">
 		SELECT COUNT(cs.id_) FROM course_schedule cs
 		WHERE cs.status_ = 'NOT_START' AND cs.del_flag_ = 0 AND cs.is_lock_ = 0 AND (cs.start_class_time_ &lt; #{courseStartTimeError} OR cs.end_class_time_ > #{courseEndTimeError})
-		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_) AND cs.pre_course_flag_ = 0
+		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_) AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
 		<if test="classGroupIds != null and classGroupIds.size() > 0">
 			AND cs.class_group_id_ IN
 			<foreach collection="classGroupIds" item="classGroupId" open="(" close=")" separator=",">
@@ -977,7 +981,7 @@
 		       COUNT(cs.id_) AS 'value'
 		FROM course_schedule cs
 		WHERE cs.status_ = 'NOT_START' AND cs.del_flag_ = 0 AND cs.is_lock_ = 0 AND cs.start_class_time_ &lt; '06:00:00'
-		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_) AND cs.pre_course_flag_ = 0
+		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_) AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
 		<if test="classGroupIds != null and classGroupIds.size() > 0">
 			AND cs.class_group_id_ IN
 			<foreach collection="classGroupIds" item="classGroupId" open="(" close=")" separator=",">
@@ -998,7 +1002,7 @@
 		LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
 		LEFT JOIN course_schedule_student_payment cssp ON cssp.course_schedule_id_ = cs.id_
 		LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cssp.course_schedule_id_ AND cssp.user_id_ = sa.user_id_
-		WHERE ta.teacher_id_ = cs.actual_teacher_id_ AND cs.pre_course_flag_ = 0
+		WHERE ta.teacher_id_ = cs.actual_teacher_id_ AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
 		AND cs.status_ = 'OVER' AND cs.del_flag_ = 0 AND cs.class_date_ >= '2021-02-01'
 		AND (((ta.sign_in_status_ = 0 OR ta.sign_in_status_ IS NULL OR ta.sign_out_status_ = 0 OR ta.sign_out_status_ IS NULL) AND ta.dispose_content_ IS NULL) OR (sa.id_ IS NULL OR (sa.status_ = 'TRUANT' AND sa.visit_flag_ = 0)))
 		AND ((ta.sign_in_status_ IS NULL AND ta.sign_out_status_ IS NOT NULL) OR (ta.sign_out_status_ IS NULL AND ta.sign_in_status_ IS NOT NULL) OR (ta.sign_out_status_ IS NOT NULL AND ta.sign_in_status_ IS NOT NULL))
@@ -1027,7 +1031,7 @@
 		LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
 		LEFT JOIN course_schedule_student_payment cssp ON cssp.course_schedule_id_ = cs.id_
 		LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cssp.course_schedule_id_ AND cssp.user_id_ = sa.user_id_
-		WHERE ta.teacher_id_ = cs.actual_teacher_id_
+		WHERE ta.teacher_id_ = cs.actual_teacher_id_ and cs.tenant_id_ = #{tenantId}
 		AND cs.status_ = 'OVER' AND cs.del_flag_ = 0 AND cs.class_date_ >= '2021-02-01' AND cs.pre_course_flag_ = 0
 		AND (((ta.sign_in_status_ = 0 OR ta.sign_in_status_ IS NULL OR ta.sign_out_status_ = 0 OR ta.sign_out_status_ IS NULL) AND ta.dispose_content_ IS NULL) OR (sa.id_ IS NULL OR (sa.status_ = 'TRUANT' AND sa.visit_flag_ = 0)))
 		AND ((ta.sign_in_status_ IS NULL AND ta.sign_out_status_ IS NOT NULL) OR (ta.sign_out_status_ IS NULL AND ta.sign_in_status_ IS NOT NULL) OR (ta.sign_out_status_ IS NOT NULL AND ta.sign_in_status_ IS NOT NULL))
@@ -1051,7 +1055,7 @@
 	<select id="getNoAttendance" resultType="int">
 		SELECT COUNT(DISTINCT cs.id_) FROM course_schedule cs
 		LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
-		WHERE ta.teacher_id_ = cs.actual_teacher_id_
+		WHERE ta.teacher_id_ = cs.actual_teacher_id_ and cs.tenant_id_ = #{tenantId}
 		AND cs.status_ = 'OVER' AND cs.del_flag_ = 0 AND cs.class_date_>='2021-02-01' AND cs.pre_course_flag_ = 0
 		AND ta.sign_in_time_ IS NULL AND ta.sign_out_time_ IS NULL AND ta.dispose_content_ IS NULL
 		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
@@ -1076,7 +1080,7 @@
 		    COUNT(DISTINCT cs.id_) AS 'value'
 		FROM course_schedule cs
 		LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
-		WHERE ta.teacher_id_ = cs.actual_teacher_id_
+		WHERE ta.teacher_id_ = cs.actual_teacher_id_ and cs.tenant_id_ = #{tenantId}
 		AND cs.status_ = 'OVER' AND cs.del_flag_ = 0 AND cs.class_date_>='2021-02-01' AND cs.pre_course_flag_ = 0
 		AND ta.sign_in_time_ IS NULL AND ta.sign_out_time_ IS NULL AND ta.dispose_content_ IS NULL
 		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
@@ -1099,7 +1103,7 @@
 	<select id="queryTeacherLeave" resultType="int">
 		SELECT COUNT(DISTINCT tlr.id_) FROM teacher_leave_record tlr
 		LEFT JOIN teacher t ON t.id_ = tlr.user_id_
-		WHERE tlr.status_ = 'ING' AND DATE_FORMAT( tlr.create_time_, '%Y-%m-%d' ) >= #{startTime}
+		WHERE tlr.status_ = 'ING' AND DATE_FORMAT( tlr.create_time_, '%Y-%m-%d' ) >= #{startTime} and tlr.tenant_id_ = #{tenantId}
 		<if test="organIdsStr != null and organIdsStr != ''">
 			AND FIND_IN_SET(t.organ_id_,#{organIdsStr})
 		</if>
@@ -1109,7 +1113,7 @@
 		LEFT JOIN teacher t ON t.id_ = tcs.user_id_
 		LEFT JOIN sys_user su ON su.id_ = tcs.user_id_
 		WHERE su.lock_flag_ = 0 AND su.del_flag_ = 0 AND t.job_nature_ = 'FULL_TIME' AND t.demission_date_ IS NULL
-		  AND t.is_settlement_salary_ = 1
+		  AND t.is_settlement_salary_ = 1 and t.tenant_id_ = #{tenantId}
 		AND DATE_FORMAT(tcs.month_,'%Y-%m') = #{monthStr} AND tcs.low_salary = 1
 		<if test="organIdsStr != null and organIdsStr != ''">
 			AND FIND_IN_SET(tcs.organ_id_,#{organIdsStr})
@@ -1124,7 +1128,7 @@
 		LEFT JOIN teacher t ON t.id_ = tcs.user_id_
 		LEFT JOIN sys_user su ON su.id_ = tcs.user_id_
 		WHERE su.lock_flag_ = 0 AND su.del_flag_ = 0 AND t.job_nature_ = 'FULL_TIME' AND t.demission_date_ IS NULL
-		AND t.is_settlement_salary_ = 1
+		AND t.is_settlement_salary_ = 1 and t.tenant_id_ = #{tenantId}
 		AND DATE_FORMAT(tcs.month_,'%Y-%m') = #{monthStr} AND tcs.low_salary = 1
 		<if test="organIdsStr != null and organIdsStr != ''">
 			AND FIND_IN_SET(tcs.organ_id_,#{organIdsStr})
@@ -1135,7 +1139,7 @@
 	<select id="queryInspectionItem" resultType="int">
 		SELECT COUNT(DISTINCT ii.id_) FROM inspection_item ii
 		LEFT JOIN inspection i ON ii.inspection_id_ = i.id_
-		WHERE ii.times_ > planned_times_ AND ii.item_ = 'INSPECT' AND ii.memo_ =''
+		WHERE ii.times_ > planned_times_ AND ii.item_ = 'INSPECT' AND ii.memo_ ='' and ii.tenant_id_ = #{tenantId}
 		AND DATE_FORMAT(i.month_,'%Y-%m-%d') >= #{startTime}
 		<if test="organIdsStr != null and organIdsStr != ''">
 			AND FIND_IN_SET(ii.organ_id_,#{organIdsStr})
@@ -1151,7 +1155,7 @@
 		       COUNT(DISTINCT ii.id_) AS 'value'
 		FROM inspection_item ii
 		LEFT JOIN inspection i ON ii.inspection_id_ = i.id_
-		WHERE ii.times_ > planned_times_ AND ii.item_ = 'INSPECT' AND ii.memo_ =''
+		WHERE ii.times_ > planned_times_ AND ii.item_ = 'INSPECT' AND ii.memo_ ='' and ii.tenant_id_ = #{tenantId}
 		AND DATE_FORMAT(i.month_,'%Y-%m-%d') >= #{startTime}
 		<if test="organIdsStr != null and organIdsStr != ''">
 			AND FIND_IN_SET(ii.organ_id_,#{organIdsStr})
@@ -1164,7 +1168,7 @@
 
 	<select id="queryInspectionItemPlan" resultType="int">
 		SELECT COUNT(DISTINCT iip.id_) FROM inspection_item_plan iip
-		WHERE iip.status_ = 0 AND iip.memo_ = '' AND DATE_FORMAT(iip.plan_start_,'%Y-%m-%d') &lt; DATE_FORMAT(NOW(),'%Y-%m-%d')
+		WHERE iip.status_ = 0 AND iip.memo_ = '' AND DATE_FORMAT(iip.plan_start_,'%Y-%m-%d') &lt; DATE_FORMAT(NOW(),'%Y-%m-%d') and iip.tenant_id_ = #{tenantId}
 		AND DATE_FORMAT(iip.plan_start_,'%Y-%m-%d') >= #{startTime} AND DATE_FORMAT(iip.plan_start_,'%Y-%m-%d') &lt;= DATE_FORMAT(NOW(),'%Y-%m-%d')
 		<if test="organIdsStr != null and organIdsStr != ''">
 			AND FIND_IN_SET(iip.organ_id_,#{organIdsStr})
@@ -1176,7 +1180,7 @@
 			iip.organ_id_ AS 'key',
 		    COUNT(DISTINCT iip.id_) AS 'value'
 		FROM inspection_item_plan iip
-		WHERE iip.status_ = 0 AND iip.memo_ = '' AND DATE_FORMAT(iip.plan_start_,'%Y-%m-%d') &lt; DATE_FORMAT(NOW(),'%Y-%m-%d')
+		WHERE iip.status_ = 0 AND iip.memo_ = '' AND DATE_FORMAT(iip.plan_start_,'%Y-%m-%d') &lt; DATE_FORMAT(NOW(),'%Y-%m-%d') and iip.tenant_id_ = #{tenantId}
 		AND DATE_FORMAT(iip.plan_start_,'%Y-%m-%d') >= #{startTime} AND DATE_FORMAT(iip.plan_start_,'%Y-%m-%d') &lt;= DATE_FORMAT(NOW(),'%Y-%m-%d')
 		<if test="organIdsStr != null and organIdsStr != ''">
 			AND FIND_IN_SET(iip.organ_id_,#{organIdsStr})
@@ -1187,7 +1191,7 @@
 	<select id="queryStudentVisit" resultType="int">
 		SELECT COUNT(DISTINCT ii.id_) FROM inspection_item ii
 		LEFT JOIN inspection i ON ii.inspection_id_ = i.id_
-		WHERE ii.item_ = 'VISIT' AND ii.memo_ =''
+		WHERE ii.item_ = 'VISIT' AND ii.memo_ ='' and ii.tenant_id_ = #{tenantId}
 		AND ii.times_ > (SELECT COUNT(DISTINCT sv.id_) FROM student_visit sv
 		WHERE sv.teacher_id_ = ii.user_id_ AND DATE_FORMAT(i.month_,'%Y-%m') = DATE_FORMAT(sv.visit_time_,'%Y-%m'))
 		AND i.month_ >= #{startTime} AND i.month_ &lt;= DATE_FORMAT(NOW(),'%Y-%m-%d')
@@ -1207,7 +1211,7 @@
 		LEFT JOIN inspection i ON ii.inspection_id_ = i.id_
 		WHERE ii.item_ = 'VISIT' AND ii.memo_ =''
 		AND ii.times_ > (SELECT COUNT(DISTINCT sv.id_) FROM student_visit sv
-		WHERE sv.teacher_id_ = ii.user_id_ AND DATE_FORMAT(i.month_,'%Y-%m') = DATE_FORMAT(sv.visit_time_,'%Y-%m'))
+		WHERE sv.teacher_id_ = ii.user_id_ AND DATE_FORMAT(i.month_,'%Y-%m') = DATE_FORMAT(sv.visit_time_,'%Y-%m')) and ii.tenant_id_ = #{tenantId}
 		AND i.month_ >= #{startTime} AND i.month_ &lt;= DATE_FORMAT(NOW(),'%Y-%m-%d')
 		<if test="organIdsStr != null and organIdsStr != ''">
 			AND FIND_IN_SET(ii.organ_id_,#{organIdsStr})
@@ -1224,7 +1228,7 @@
 		FROM
 			inspection_item_plan
 		WHERE
-			conclusion_status_ = 1 AND memo_ = '' AND DATE_FORMAT(plan_start_,'%Y-%m-%d') >= #{startTime}
+			conclusion_status_ = 1 AND memo_ = '' AND DATE_FORMAT(plan_start_,'%Y-%m-%d') >= #{startTime} and tenant_id_ = #{tenantId}
 		<if test="organIds!=null and organIds.size()>0">
 			AND organ_id_ IN
 			<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
@@ -1240,7 +1244,7 @@
 		FROM
 		inspection_item_plan
 		WHERE
-		conclusion_status_ = 1 AND memo_ = '' AND DATE_FORMAT(plan_start_,'%Y-%m-%d') >= #{startTime}
+		conclusion_status_ = 1 AND memo_ = '' AND DATE_FORMAT(plan_start_,'%Y-%m-%d') >= #{startTime} and tenant_id_ = #{tenantId}
 		<if test="organIds!=null and organIds.size()>0">
 			AND organ_id_ IN
 			<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
@@ -1261,7 +1265,7 @@
 			LEFT JOIN `subject` sub ON sr.actual_subject_id_=sub.id_
 			LEFT JOIN class_group_student_mapper cgsm ON cgsm.group_type_='MUSIC' AND cgsm.music_group_id_=sr.music_group_id_ AND cgsm.user_id_=sr.user_id_ AND cgsm.status_='NORMAL'
 		WHERE
-			sr.music_group_status_ = 'NORMAL'
+			sr.music_group_status_ = 'NORMAL' and sr.tenant_id_ = #{tenantId}
 			AND mg.status_ = 'PROGRESS'
 			AND cgsm.id_ IS NULL
 			AND sub.parent_subject_id_!=24
@@ -1286,7 +1290,7 @@
 		LEFT JOIN `subject` sub ON sr.actual_subject_id_=sub.id_
 		LEFT JOIN class_group_student_mapper cgsm ON cgsm.group_type_='MUSIC' AND cgsm.music_group_id_=sr.music_group_id_ AND cgsm.user_id_=sr.user_id_ AND cgsm.status_='NORMAL'
 		WHERE
-		sr.music_group_status_ = 'NORMAL'
+		sr.music_group_status_ = 'NORMAL' and sr.tenant_id_ = #{tenantId}
 		AND mg.status_ = 'PROGRESS'
 		AND cgsm.id_ IS NULL
 		AND sub.parent_subject_id_!=24
@@ -1304,7 +1308,7 @@
 
 	<select id="getFinancePayData"  resultMap="IndexBaseMonthData">
 		SELECT SUM(fe.amount_) total_num_,SUM(fe.amount_) activate_num_,SUM(fe.amount_) percent_,fe.organ_id_,#{dayStr} month_ FROM financial_expenditure fe
-		WHERE DATE_FORMAT(fe.create_time_,'%Y-%m-%d') = #{dayStr}
+		WHERE DATE_FORMAT(fe.create_time_,'%Y-%m-%d') = #{dayStr}  and fe.tenant_id_ = #{tenantId}
 		AND del_flag_ = 0 GROUP BY fe.organ_id_
 	</select>
 	<select id="getFinanceBalanceData" resultMap="IndexBaseMonthData">
@@ -1312,7 +1316,7 @@
 			   SUM(spo.balance_payment_amount_) activate_num_,
 			   SUM(spo.balance_payment_amount_) percent_,#{dayStr} month_
 		FROM student_payment_order spo
-		WHERE spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') = #{dayStr}
+		WHERE spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') = #{dayStr}  and spo.tenant_id_ = #{tenantId}
 		GROUP BY spo.organ_id_
 	</select>
 	<select id="getFinanceActualData" resultMap="IndexBaseMonthData">
@@ -1320,14 +1324,14 @@
 			   SUM(spo.actual_amount_) activate_num_,
 			   SUM(spo.actual_amount_) percent_,#{dayStr} month_
 		FROM student_payment_order spo
-		WHERE spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') = #{dayStr}
+		WHERE spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') = #{dayStr} and spo.tenant_id_ = #{tenantId}
 		GROUP BY spo.organ_id_
 	</select>
 
 	<select id="getFinancePayDataWithTimely"  resultMap="IndexBaseMonthData">
 		SELECT SUM(fe.amount_) total_num_,SUM(fe.amount_) activate_num_,SUM(fe.amount_) percent_,fe.organ_id_,DATE_FORMAT(fe.create_time_,'%Y-%m-%d') month_
 		FROM financial_expenditure fe
-		WHERE DATE_FORMAT(fe.create_time_,'%Y-%m-%d') BETWEEN #{startDate} AND #{endDate}
+		WHERE DATE_FORMAT(fe.create_time_,'%Y-%m-%d') BETWEEN #{startDate} AND #{endDate} and fe.tenant_id_ = #{tenantId}
 		  AND del_flag_ = 0
 			<if test="organIds!=null and organIds.size()>0">
 				AND fe.organ_id_ IN
@@ -1342,7 +1346,7 @@
 			   SUM(CASE WHEN spo.balance_payment_amount_ IS NULL THEN 0 ELSE spo.balance_payment_amount_ END) activate_num_,
 			   SUM(CASE WHEN spo.balance_payment_amount_ IS NULL THEN 0 ELSE spo.balance_payment_amount_ END) percent_,DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') month_
 		FROM student_payment_order spo
-		WHERE spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') BETWEEN #{startDate} AND #{endDate}
+		WHERE spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') BETWEEN #{startDate} AND #{endDate} and spo.tenant_id_ = #{tenantId}
 		<if test="organIds!=null and organIds.size()>0">
 			AND spo.organ_id_ IN
 			<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
@@ -1356,7 +1360,7 @@
 			   SUM(spo.actual_amount_) activate_num_,
 			   SUM(spo.actual_amount_) percent_,DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') month_
 		FROM student_payment_order spo
-		WHERE spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') BETWEEN #{startDate} AND #{endDate}
+		WHERE spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') BETWEEN #{startDate} AND #{endDate} and spo.tenant_id_ = #{tenantId}
 		<if test="organIds!=null and organIds.size()>0">
 			AND spo.organ_id_ IN
 			<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
@@ -1373,7 +1377,7 @@
 			   SUM(CASE WHEN spo.actual_amount_ IS NULL THEN 0 ELSE spo.actual_amount_ END +
 		CASE WHEN spo.balance_payment_amount_ IS NULL THEN 0 ELSE spo.balance_payment_amount_ END) percent_,DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') month_
 		FROM student_payment_order spo
-		WHERE spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') BETWEEN #{startDate} AND #{endDate}
+		WHERE spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') BETWEEN #{startDate} AND #{endDate} and spo.tenant_id_ = #{tenantId}
 		<if test="organIds!=null and organIds.size()>0">
 			AND spo.organ_id_ IN
 			<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
@@ -1390,7 +1394,7 @@
 			   SUM(CASE WHEN spo.actual_amount_ IS NULL THEN 0 ELSE spo.actual_amount_ END +
 		CASE WHEN spo.balance_payment_amount_ IS NULL THEN 0 ELSE spo.balance_payment_amount_ END) percent_,DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') month_
 		FROM student_payment_order spo
-		WHERE spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') BETWEEN #{startDate} AND #{endDate}
+		WHERE spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') BETWEEN #{startDate} AND #{endDate} and spo.tenant_id_ = #{tenantId}
 		<if test="orderType != null">
 			AND FIND_IN_SET(spo.type_,#{orderType})
 		</if>
@@ -1414,7 +1418,7 @@
 		SELECT spo.organ_id_,SUM(CASE WHEN spod.price_ IS NULL THEN 0 ELSE spod.price_ END) total_num_,DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') month_
 		FROM student_payment_order spo
 		LEFT JOIN student_payment_order_detail spod ON spo.id_ = spod.payment_order_id_
-		WHERE spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') BETWEEN #{startDate} AND #{endDate}
+		WHERE spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') BETWEEN #{startDate} AND #{endDate} and spo.tenant_id_ = #{tenantId}
 		AND spo.type_ = 'DEGREE' AND spod.type_ IN ('THEORY_COURSE','VIP')
 		<if test="organIds!=null and organIds.size()>0">
 			AND spo.organ_id_ IN
@@ -1446,7 +1450,7 @@
 							   CASE WHEN spo.balance_payment_amount_ IS NULL THEN 0 ELSE spo.balance_payment_amount_ END) total_num_
 		   ,DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') month_,spo.type_
 		FROM student_payment_order spo
-		WHERE spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') BETWEEN #{startDate} AND #{endDate}
+		WHERE spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') BETWEEN #{startDate} AND #{endDate} and spo.tenant_id_ = #{tenantId}
 		AND spo.type_ NOT IN ('APPLY','RENEW','PRACTICE_GROUP_BUY','PRACTICE_GROUP_RENEW','SMALL_CLASS_TO_BUY','DEGREE')
 		<if test="organIds!=null and organIds.size()>0">
 			AND spo.organ_id_ IN
@@ -1473,6 +1477,7 @@
 
 	<sql id="queryTeacherServeInfoCondition">
 		<where>
+			 sees.tenant_id_ = #{tenantId}
 			<if test="organIds!=null and organIds.size()>0">
 				AND tea.organ_id_ IN
 				<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
@@ -1532,7 +1537,7 @@
 		SELECT COUNT(DISTINCT c.user_id_) FROM (
 		SELECT sa.user_id_ FROM student_attendance sa
 		LEFT JOIN course_schedule cs ON cs.id_ = sa.course_schedule_id_
-		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') >= #{format} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0
+		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') >= #{format} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
 		<if test="organIdList != null and organIdList.size > 0">
 			AND cs.organ_id_ IN
 			<foreach collection="organIdList" open="(" close=")" item="item" separator=",">
@@ -1552,7 +1557,7 @@
 		SELECT c.organ_id_ 'key',COUNT(c.user_id_) 'value' FROM (
 		SELECT sa.user_id_,cs.organ_id_ FROM student_attendance sa
 		LEFT JOIN course_schedule cs ON cs.id_ = sa.course_schedule_id_
-		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') >= '2021-11' AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0
+		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') >= '2021-11' AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
 		<if test="classGroupIds != null and classGroupIds.size() > 0">
 			AND cs.class_group_id_ IN
 			<foreach collection="classGroupIds" item="classGroupId" open="(" close=")" separator=",">
@@ -1574,7 +1579,7 @@
 		SELECT sa.user_id_ FROM student_attendance sa
 		LEFT JOIN course_schedule cs ON cs.id_ = sa.course_schedule_id_
 		LEFT JOIN sys_user su ON su.id_ = sa.user_id_
-		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') >= #{currentMonth} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0
+		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') >= #{currentMonth} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
 		<if test="organId != null">
 			AND FIND_IN_SET(cs.organ_id_,#{organId})
 		</if>
@@ -1607,7 +1612,7 @@
 		LEFT JOIN course_schedule cs ON cs.id_ = sa.course_schedule_id_
 		LEFT JOIN organization o ON o.id_ = cs.organ_id_
 		LEFT JOIN sys_user su ON su.id_ = sa.user_id_
-		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') >= #{currentMonth} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0
+		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') >= #{currentMonth} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
 		<if test="organId != null">
 			AND FIND_IN_SET(cs.organ_id_,#{organId})
 		</if>
@@ -1633,7 +1638,7 @@
 	</select>
 	<sql id="queryStudentLeaveCourseListSql">
 		<where>
-			sa.user_id_ = #{userId} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0
+			sa.user_id_ = #{userId} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
 				AND (cs.id_ = #{search} OR cs.actual_teacher_id_ = #{search} OR su.real_name_ LIKE CONCAT('%',#{search},'%'))
 			</if>
@@ -1675,7 +1680,7 @@
 		FROM student_attendance sa
 		LEFT JOIN course_schedule cs ON cs.id_ = sa.course_schedule_id_
 		LEFT JOIN sys_user su ON su.id_ = sa.user_id_
-		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') >= #{totalMonth} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0
+		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') >= #{totalMonth} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
 		<if test="organId != null">
 			AND FIND_IN_SET(cs.organ_id_,#{organId})
 		</if>
@@ -1708,7 +1713,7 @@
 				LEFT JOIN music_group mg ON sr.music_group_id_=mg.id_
 				LEFT JOIN sys_user su ON sr.user_id_ = su.id_
 			WHERE
-				su.del_flag_ = 0
+				su.del_flag_ = 0 and sr.tenant_id_ = #{tenantId}
 				AND mg.status_='PROGRESS'
 				AND sr.music_group_status_ = 'NORMAL'
 				<if test="dayStr!=null and dayStr!=''">
@@ -1724,7 +1729,7 @@
 				LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
 				LEFT JOIN sys_user su ON cssp.user_id_ = su.id_
 			WHERE
-				cssp.group_type_ IN ( 'VIP', 'PRACTICE' )
+				cssp.group_type_ IN ( 'VIP', 'PRACTICE' ) and cssp.tenant_id_ = #{tenantId}
 				AND cs.status_ = 'NOT_START'
 				AND su.del_flag_ = 0
 				<if test="dayStr!=null and dayStr!=''">
@@ -1743,7 +1748,7 @@
 			COUNT(DISTINCT cto.student_id_) percent_
 		FROM cloud_teacher_order cto
 			LEFT JOIN sys_user su ON cto.student_id_=su.id_
-		WHERE su.del_flag_=0 AND cto.status_ IN (1,2)
+		WHERE su.del_flag_=0 AND cto.status_ IN (1,2) and cto.tenant_id_ = #{tenantId}
 			<if test="dayStr!=null and dayStr!=''">
 				AND DATE(cto.create_time_)&lt;= #{dayStr}
 			</if>
@@ -1759,7 +1764,7 @@
 		COUNT(DISTINCT cto.student_id_) percent_
 		FROM cloud_teacher_order cto
 		LEFT JOIN sys_user su ON cto.student_id_=su.id_
-		WHERE su.del_flag_=0 AND cto.status_ IN (1,2)
+		WHERE su.del_flag_=0 AND cto.status_ IN (1,2) and cto.tenant_id_ = #{tenantId}
 		<if test="dayStr!=null and dayStr!=''">
 			AND DATE(cto.create_time_)= #{dayStr}
 		</if>
@@ -1776,7 +1781,7 @@
 		FROM student stu
 		LEFT JOIN cloud_teacher_order cto ON stu.user_id_=cto.student_id_
 		LEFT JOIN sys_user su ON su.id_=stu.user_id_
-		WHERE su.del_flag_=0 AND stu.experience_member_rank_setting_id_ IS NOT NULL AND (cto.id_ IS NULL OR cto.status_ NOT IN (1, 2))
+		WHERE su.del_flag_=0 AND stu.experience_member_rank_setting_id_ IS NOT NULL AND (cto.id_ IS NULL OR cto.status_ NOT IN (1, 2)) and cto.tenant_id_ = #{tenantId}
 		<if test="dayStr!=null and dayStr!=''">
 			AND DATE(stu.experience_membership_start_time_)&lt;= #{dayStr}
 		</if>
@@ -1793,7 +1798,7 @@
 		FROM sys_music_compare_record smcr
 			LEFT JOIN sys_user su ON smcr.user_id_=su.id_
 			LEFT JOIN student stu ON smcr.user_id_=stu.user_id_
-		WHERE su.del_flag_=0 AND stu.user_id_ IS NOT NULL
+		WHERE su.del_flag_=0 AND stu.user_id_ IS NOT NULL and smcr.tenant_id_ = #{tenantId}
 			<if test="dayStr!=null and dayStr!=''">
 				AND DATE(smcr.create_time_)= #{dayStr}
 			</if>
@@ -1814,7 +1819,7 @@
 			FROM sys_music_compare_record smcr
 			LEFT JOIN sys_user su ON smcr.user_id_=su.id_
 			LEFT JOIN student stu ON smcr.user_id_=stu.user_id_
-			WHERE su.del_flag_=0 AND stu.user_id_ IS NOT NULL
+			WHERE su.del_flag_=0 AND stu.user_id_ IS NOT NULL and smcr.tenant_id_ = #{tenantId}
 			<if test="dayStr!=null and dayStr!=''">
 				AND DATE(smcr.create_time_) &lt;= #{dayStr}
 			</if>
@@ -1837,7 +1842,7 @@
 		FROM
 			sys_music_compare_record smcr
 			LEFT JOIN sys_user su ON smcr.user_id_ = su.id_
-		WHERE su.del_flag_ = 0
+		WHERE su.del_flag_ = 0 and smcr.tenant_id_ = #{tenantId}
 		GROUP BY user_id_
 		HAVING MIN(DATE( smcr.create_time_ ))= #{dayStr}) t
 		GROUP BY t.organ_id_
@@ -1858,7 +1863,7 @@
 		LEFT JOIN cloud_teacher_order cto ON cto.student_id_ = s.user_id_ AND cto.status_ != 0 AND cto.active_remark_ = '202109'
 		LEFT JOIN sys_user su ON su.id_ = s.user_id_
 		LEFT JOIN organization o ON o.id_ = su.organ_id_
-		WHERE 1=1
+		WHERE  s.tenant_id_ = #{tenantId}
 		<if test="organIdList != null and organIdList.size > 0">
 			AND su.organ_id_ IN
 			<foreach collection="organIdList" open="(" close=")" item="item" separator=",">
@@ -1867,10 +1872,4 @@
 		</if>
 		GROUP BY su.organ_id_
 	</select>
-	<select id="countTotalStudentNum" resultType="java.util.Map">
-		SELECT su.organ_id_ 'key',COUNT(DISTINCT s.user_id_) 'value' FROM student s
-		LEFT JOIN sys_user su ON su.id_ = s.user_id_
-		WHERE s.count_flag_ = 1
-		GROUP BY su.organ_id_
-	</select>
 </mapper>

+ 17 - 23
mec-biz/src/main/resources/config/mybatis/IndexErrDataRecordMapper.xml

@@ -15,6 +15,7 @@
 		<result column="generate_time_" property="generateTime"/>
 		<result column="create_time_" property="createTime" />
 		<result column="deal_time_" property="dealTime" />
+		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -24,7 +25,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="IndexErrDataRecord">
-		SELECT * FROM index_err_data_record ORDER BY id_
+		SELECT * FROM index_err_data_record where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
@@ -34,16 +35,16 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO index_err_data_record (organ_id_,data_id_,data_type_,deal_user_id_,generate_time_,deal_time_,create_time_)
-		VALUES(#{organId},#{dataId},#{dataType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{dealUserId},#{generateTime},#{dealTime},NOW())
+		INSERT INTO index_err_data_record (organ_id_,data_id_,data_type_,deal_user_id_,generate_time_,deal_time_,create_time_,tenant_id_)
+		VALUES(#{organId},#{dataId},#{dataType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{dealUserId},#{generateTime},#{dealTime},NOW(),#{tenantId})
 	</insert>
 
 	<insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.IndexErrDataRecord" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO index_err_data_record (organ_id_,data_id_,data_type_,deal_user_id_,generate_time_,deal_time_,create_time_)
+		INSERT INTO index_err_data_record (organ_id_,data_id_,data_type_,deal_user_id_,generate_time_,deal_time_,create_time_,tenant_id_)
 		VALUE
 		<foreach collection="datas" item="data" separator=",">
 			(#{data.organId},#{data.dataId},#{data.dataType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{data.dealUserId},
-			#{data.generateTime},#{data.dealTime},NOW())
+			#{data.generateTime},#{data.dealTime},NOW(),#{data.tenantId})
 		</foreach>
 	</insert>
 
@@ -70,7 +71,7 @@
 				deal_time_ = #{dealTime},
 			</if>
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<update id="batchUpdate" parameterType="com.ym.mec.biz.dal.entity.IndexErrDataRecord">
@@ -96,7 +97,7 @@
 					deal_time_ = #{data.dealTime},
 				</if>
 			</set>
-			WHERE id_ = #{data.id}
+			WHERE id_ = #{data.id} and tenant_id_ = #{data.tenantId}
 		</foreach>
 	</update>
 
@@ -116,21 +117,22 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="IndexErrDataRecord" parameterType="map">
-		SELECT * FROM index_err_data_record ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM index_err_data_record where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM index_err_data_record
+		SELECT COUNT(*) FROM index_err_data_record where tenant_id_ = #{tenantId}
 	</select>
 
 	<select id="countWithGenerateTime" resultType="int">
-		SELECT COUNT(id_) FROM index_err_data_record WHERE generate_time_=#{generateTime}
+		SELECT COUNT(id_) FROM index_err_data_record WHERE generate_time_=#{generateTime} and tenant_id_ = #{tenantId}
 	</select>
 
 	<select id="getWithGenerateTime" resultMap="IndexErrDataRecord">
 		SELECT * FROM index_err_data_record
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="organIds!=null and organIds.size()>0">
 				AND organ_id_ IN
 				<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
@@ -269,6 +271,7 @@
 
 	<sql id="queryErrStringsCondition">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="queryOrganIds!=null and queryOrganIds.size()>0">
 				AND organ_id_ IN
 				<foreach collection="queryOrganIds" item="organId" open="(" close=")" separator=",">
@@ -301,7 +304,7 @@
 	</select>
 
 	<select id="getWithOrganMonthUserStr" resultMap="IndexErrDataRecord">
-		SELECT * FROM index_err_data_record WHERE CONCAT(generate_time_, organ_id_, deal_user_id_) IN
+		SELECT * FROM index_err_data_record WHERE tenant_id_ = #{tenantId} and CONCAT(generate_time_, organ_id_, deal_user_id_) IN
 		<foreach collection="omuStrings" item="omuString" open="(" close=")" separator=",">
 			#{omuString}
 		</foreach>
@@ -336,6 +339,7 @@
 
 	<sql id="queryErrInspectionDataCondition">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="searchType != null and searchType != ''">
 				<if test="searchType == 'MUSIC_PATROL_ITEM'">
 					irdr.data_type_ = 'MUSIC_PATROL_ITEM'
@@ -428,6 +432,7 @@
 
 	<sql id="queryErrStudentVisitCondition">
 		<where>
+			tenant_id_ = #{tenantId} and
 			irdr.data_type_ = 'STUDENT_VISIT'
 			<if test="hasDealTime!=null and hasDealTime">
 				AND irdr.deal_time_ IS NOT NULL
@@ -531,20 +536,9 @@
 		<include refid="endFindCourseSchedulesCondition"/>
 	</select>
 
-	<select id="getAllDealUserIds" resultType="int">
-		SELECT DISTINCT deal_user_id_ FROM index_err_data_record
-		<where>
-			<if test="organIds!=null and organIds.size()>0">
-				AND organ_id_ IN
-				<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
-					#{organId}
-				</foreach>
-			</if>
-		</where>
-	</select>
-
 	<sql id="endFindCourseSchedulesCondition">
 		<where>
+			irdr.tenant_id_ = #{tenantId}
 			<if test="searchType == 'ERR_ATTENDANCE'">
 				AND irdr.data_type_ = 'TEACHER_EXCEPTION_ATTENDANCE'
 			</if>