فهرست منبع

1、服务指标;
2、增加课外训练待布置学员列表;
3、网管课续费提醒;

Joburgess 5 سال پیش
والد
کامیت
df6dafd88a

+ 4 - 3
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ExtracurricularExercisesDao.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
 import com.ym.mec.biz.dal.entity.ExtracurricularExercises;
 import com.ym.mec.common.dal.BaseDAO;
@@ -33,8 +34,8 @@ public interface ExtracurricularExercisesDao extends BaseDAO<Long, Extracurricul
      * @param search:
      * @return java.util.List<com.ym.mec.biz.dal.dto.SimpleUserDto>
      */
-    List<SimpleUserDto> findNoExercisesStudentsInThisWeekWithTeacher(@Param("teacherId") Integer teacherId,
-                                                                     @Param("startDate") String startDate,
-                                                                     @Param("search") String search);
+    List<BasicUserDto> findNoExercisesStudentsInThisWeekWithTeacher(@Param("teacherId") Integer teacherId,
+                                                                    @Param("startDate") String startDate,
+                                                                    @Param("search") String search);
 
 }

+ 2 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/ExtracurricularExercisesService.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.service;
 
+import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
 import com.ym.mec.biz.dal.entity.ExtracurricularExercises;
 import com.ym.mec.biz.dal.page.ExtraExercilseQueryInfo;
@@ -35,6 +36,6 @@ public interface ExtracurricularExercisesService extends BaseService<Long, Extra
      * @param search:
      * @return java.util.List<com.ym.mec.biz.dal.dto.SimpleUserDto>
      */
-    List<SimpleUserDto> getDontServeStudents(Integer teacherId, String search);
+    List<BasicUserDto> getDontServeStudents(Integer teacherId, String search);
 
 }

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service.impl;
 import com.ym.mec.biz.dal.dao.ExtracurricularExercisesDao;
 import com.ym.mec.biz.dal.dao.ExtracurricularExercisesReplyDao;
 import com.ym.mec.biz.dal.dao.TeacherDao;
+import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
 import com.ym.mec.biz.dal.entity.ExtracurricularExercises;
 import com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply;
@@ -160,7 +161,7 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 	}
 
 	@Override
-	public List<SimpleUserDto> getDontServeStudents(Integer teacherId, String search) {
+	public List<BasicUserDto> getDontServeStudents(Integer teacherId, String search) {
 		LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
 		LocalDate monDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
 		return extracurricularExercisesDao.findNoExercisesStudentsInThisWeekWithTeacher(teacherId, monDayDate.toString(), search);

+ 3 - 3
mec-biz/src/main/resources/config/mybatis/ExtracurricularExercisesMapper.xml

@@ -164,9 +164,9 @@
             resultType="com.ym.mec.biz.dal.dto.SimpleUserDto">
 		SELECT
 			su.id_ userId,
-			su.username_ userName,
-			su.avatar_ avatar,
-			GROUP_CONCAT(sub.name_) subjectNames
+			su.username_ name,
+			su.avatar_ headUrl,
+			GROUP_CONCAT(sub.name_) subjectName
 		FROM
 			student_extracurricular_exercises_situation_ sees
 			LEFT JOIN extracurricular_exercises_reply eer ON sees.student_id_ = eer.user_id_