update

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

@@ -103,9 +103,9 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
 
     List<StudentServeCourseDto> getStudentFutureCourseInfo(@Param("monday") String monday,
                                                            @Param("nextMonday") String nextMonday,
-                                                           @Param("studentIds") List<Integer> studentIds);
+                                                           @Param("studentIds") List<Integer> studentIds, @Param("tenantId") Integer tenantId);
 
-    List<StudentServeCourseDto> getNoCourseBeServeStudentInfo(@Param("noCourseStudentIds") List<Integer> noCourseStudentIds);
+    List<StudentServeCourseDto> getNoCourseBeServeStudentInfo(@Param("noCourseStudentIds") List<Integer> noCourseStudentIds, @Param("tenantId") Integer tenantId);
 
 
     List<StudentServeDto> getBeServiceStudentsInfoWithStudents(@Param("monday") String monday,

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

@@ -169,6 +169,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
                 Student student = new Student();
                 student.setUserId(studentAttendance.getUserId());
                 student.setCurrentGradeNum(studentAttendance.getCurrentGradeNum());
+                student.setTenantId(studentAttendance.getTenantId());
                 students.add(student);
             }
             studentAttendance.setTeacherId(sysUser.getId());

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

@@ -300,7 +300,7 @@ public class StudentServeServiceImpl implements StudentServeService {
     @Transactional(rollbackFor = Exception.class)
     public void exercisesSituationStatistics2(String monday, List<Integer> studentIds, Integer tenantId) {
         LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
-
+        
         int preWeekServiceNum = studentExtracurricularExercisesSituationDao.countWeekServiceNum(nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue()).plusDays(-7).toString(), tenantId);
         int lastWeekTodayUpdateNum = studentExtracurricularExercisesSituationDao.findLastWeekTodayUpdateNum(nowDate.plusDays(-nowDate.getDayOfWeek().getValue()).toString(), tenantId);
         if(preWeekServiceNum>0 && lastWeekTodayUpdateNum<=0){
@@ -340,7 +340,7 @@ public class StudentServeServiceImpl implements StudentServeService {
 //            return;
 //        }
 
-        List<StudentServeCourseDto> studentFutureCourseInfo = studentDao.getStudentFutureCourseInfo(monDayDate.toString(), DateUtil.dateToString(nextMonday, "yyyy-MM-dd"), studentIds);
+        List<StudentServeCourseDto> studentFutureCourseInfo = studentDao.getStudentFutureCourseInfo(monDayDate.toString(), DateUtil.dateToString(nextMonday, "yyyy-MM-dd"), studentIds, tenantId);
         if(CollectionUtils.isEmpty(studentFutureCourseInfo)){
             return;
         }
@@ -360,7 +360,7 @@ public class StudentServeServiceImpl implements StudentServeService {
         }
         List<StudentServeCourseDto> noCourseBeServeStudentInfo = new ArrayList<>();
         if(!CollectionUtils.isEmpty(musicStudentIds)){
-            noCourseBeServeStudentInfo = studentDao.getNoCourseBeServeStudentInfo(new ArrayList<>(musicStudentIds));
+            noCourseBeServeStudentInfo = studentDao.getNoCourseBeServeStudentInfo(new ArrayList<>(musicStudentIds), tenantId);
         }
 
         Map<Integer, Set<String>> noCourseStudentMusicIdsMap = noCourseBeServeStudentInfo.stream().collect(Collectors.groupingBy(StudentServeCourseDto::getStudentId, Collectors.mapping(StudentServeCourseDto::getMusicGroupId, Collectors.toSet())));

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

@@ -52,7 +52,7 @@
 		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(),#{tenantId})
+			#{dataType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{data.extendInfo},NOW(),NOW(),#{data.tenantId})
 		</foreach>
 	</insert>
 

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

@@ -286,7 +286,7 @@
 	            </if>
                 update_time_ = NOW()
             </set>
-            WHERE user_id_ = #{item.userId} and tenant_id_ = #{tenantId}
+            WHERE user_id_ = #{item.userId} and tenant_id_ = #{item.tenantId}
         </foreach>
     </update>
     <update id="updateStudentServiceOrOperatingTag">
@@ -609,17 +609,19 @@
         FROM course_schedule_student_payment cssp
             LEFT JOIN course_schedule cs ON cssp.course_schedule_id_=cs.id_
             LEFT JOIN student stu ON cssp.user_id_ = stu.user_id_
-        WHERE stu.service_tag_=1
+        WHERE stu.service_tag_=1 and cssp.tenant_id_ = #{tenantId}
             AND (stu.service_tag_update_time_ IS NULL OR stu.service_tag_update_time_&lt;#{nextMonday})
             AND (cs.del_flag_ IS NULL OR cs.del_flag_=0)
             AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
             AND cs.class_date_&gt;=#{monday}
             AND cs.type_ IN ('SINGLE', 'TRAINING_SINGLE', 'VIP', 'MIX', 'TRAINING_MIX', 'PRACTICE')
             AND cssp.create_time_&lt;#{nextMonday}
+            <if test="studentIds!=null and studentIds.size()>0">
                 AND cssp.user_id_ IN
                 <foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
                     #{studentId}
                 </foreach>
+            </if>
         ORDER BY cssp.user_id_,course_start_time_
     </select>
 
@@ -634,14 +636,16 @@
             LEFT JOIN student stu ON sr.user_id_ = stu.user_id_
             LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
         WHERE
-            mg.del_flag_ = 0
+            mg.del_flag_ = 0 and sr.tenant_id_ = #{tenantId}
             AND mg.organ_id_ IS NOT NULL
             AND mg.status_ = 'PROGRESS'
             AND sr.music_group_status_ = 'NORMAL'
-                AND sr.user_id_ IN
-                <foreach collection="noCourseStudentIds" item="noCourseStudentId" open="(" close=")" separator=",">
-                    #{noCourseStudentId}
+            <if test="studentIds!=null and studentIds.size()>0">
+                AND cssp.user_id_ IN
+                <foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
+                    #{studentId}
                 </foreach>
+            </if>
     </select>
 
     <select id="getStudentNames" resultType="string">

mec-web/src/main/java/com/ym/mec/web/controller/TaskController.java

@@ -347,7 +347,7 @@ public class TaskController extends BaseController {
 	//学生服务信息统计
 	@GetMapping("/exercisesSituationStatistics")
 	public void exercisesSituationStatistics(String monday){
-		studentServeService.exercisesSituationStatistics2(monday,null,null);
+		studentServeService.exercisesSituationStatistics2(monday,null,1);
 //		studentServeService.exercisesSituationStatistics2(null,new ArrayList<>(Arrays.asList(1095257)));
 //		studentServeService.exercisesSituationStatistics(null);
 	}