1、服务指标

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

@@ -19,6 +19,7 @@ import com.ym.mec.util.date.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
@@ -125,6 +126,10 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 			pageInfo.setTotal(count);
 			params.put("offset", pageInfo.getOffset());
 			dataList = extracurricularExercisesReplyDao.findStudentHomeworkDetailsInTimeZone(params);
+			for (StudentServiceDetailDto studentServiceDetailDto : dataList) {
+				LocalDate homeworkCreateTime = LocalDateTime.ofInstant(studentServiceDetailDto.getHomeworkCreateTime().toInstant(), DateUtil.zoneId).toLocalDate();
+				int weekOfYear = homeworkCreateTime.get(DateUtil.weekFields.weekOfYear());
+			}
 		}
 		if (count == 0) {
 			dataList = new ArrayList<>();

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

@@ -125,7 +125,7 @@
 			MAX(sees.id_) id_,
 			student_id_,
 			stu.username_ student_name_,
-			GROUP_CONCAT(tea.real_name_) teacher_name_,
+			tea.real_name_ teacher_name_,
 			o.name_ organ_name_,
 			SUM( expect_exercises_num_ ) expect_exercises_num_,
 			SUM( actual_exercises_num_ ) actual_exercises_num_,
@@ -165,7 +165,7 @@
 				AND NOT EXISTS (SELECT cssp.id_ FROM course_schedule_student_payment cssp LEFT JOIN course_schedule cs ON cs.id_=cssp.course_schedule_id_ LEFT JOIN practice_group pg ON pg.id_=cssp.music_group_id_ WHERE cssp.user_id_=sees.student_id_ AND cssp.group_type_='PRACTICE' AND pg.type_='CHARGE' AND class_date_ BETWEEN #{monday} AND #{sunday})
 			</if>
 			GROUP BY
-			student_id_
+			student_id_,teacher_id_
 			<trim prefix="HAVING" suffixOverrides="and">
 				<if test="expectExercisesNum!=null">  SUM( expect_exercises_num_ ) = #{expectExercisesNum}</if>
 				<if test="actualExercisesNumIsAchieve!=null and actualExercisesNumIsAchieve==0">
@@ -231,7 +231,7 @@
 				AND NOT EXISTS (SELECT cssp.id_ FROM course_schedule_student_payment cssp LEFT JOIN course_schedule cs ON cs.id_=cssp.course_schedule_id_ LEFT JOIN practice_group pg ON pg.id_=cssp.music_group_id_ WHERE cssp.user_id_=sees.student_id_ AND cssp.group_type_='PRACTICE' AND pg.type_='CHARGE' AND class_date_ BETWEEN #{monday} AND #{sunday})
 			</if>
 			GROUP BY
-			student_id_
+			student_id_,teacher_id_
 			<trim prefix="HAVING" suffixOverrides="and">
 				<if test="expectExercisesNum!=null">  SUM( expect_exercises_num_ ) = #{expectExercisesNum}</if>
 				<if test="actualExercisesNumIsAchieve!=null and actualExercisesNumIsAchieve==0">