update

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

@@ -358,6 +358,13 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
     @Override
     public Map<String, Object> getCourseHomeworkDetail(CourseHomeworkQueryInfo queryInfo) {
         Map<String, Object> result = new HashMap<>();
+        CourseHomework courseHomework = courseHomeworkDao.findByCourseSchedule(queryInfo.getCourseScheduleId());
+
+        if(Objects.isNull(courseHomework)){
+            result.put("countInfo", null);
+            return result;
+        }
+
         PageInfo<StudentCourseHomeworkDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);
@@ -386,7 +393,6 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
             }
             Map<Integer, SimpleUserDto> studentInfoMap = usersSimpleInfo.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, s -> s, (s1, s2) -> s1));
             Map<Integer, Student> studentMap = students.stream().collect(Collectors.toMap(Student::getUserId, s -> s, (s1, s2) -> s1));
-            Map<Integer, Subject> idSubjectMap = subjects.stream().collect(Collectors.toMap(Subject::getId, s -> s));
             for (StudentCourseHomework studentCourseHomework : dataList) {
                 StudentCourseHomeworkDto s = new StudentCourseHomeworkDto();
                 s.setStudentId(studentCourseHomework.getUserId());
@@ -408,9 +414,8 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
         pageInfo.setRows(studentCourseHomeworkDtos);
 
         if(queryInfo.getPage()==1){
-            CourseHomework courseHomework = courseHomeworkDao.findByCourseSchedule(queryInfo.getCourseScheduleId());
-            params.put("", 1);
-            int repliedNum = studentCourseHomeworkDao.queryCount(params);
+            params.put("isReplied", 1);
+            int repliedNum = studentCourseHomeworkDao.countAll(params);
             CourseHomeworkDto courseHomeworkDto = new CourseHomeworkDto();
             courseHomeworkDto.setExpectNum(courseHomework.getExpectNum());
             courseHomeworkDto.setCompletedNum(courseHomework.getCompletedNum());

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

@@ -473,7 +473,7 @@
             GROUP BY sa.course_schedule_id_
     </select>
     <select id="findStudentAttendance" resultMap="StudentAttendance">
-        SELECT sa.*,su.username_,su.phone_,IF(s.name_ IS NULL,s1.name_,s.name_) subject_name_,su.avatar_
+        SELECT cssp.user_id_,sa.*,su.username_,su.phone_,IF(s.name_ IS NULL,s1.name_,s.name_) subject_name_,su.avatar_
         FROM course_schedule_student_payment cssp
         LEFT JOIN student_attendance sa ON cssp.course_schedule_id_ = sa.course_schedule_id_ AND cssp.user_id_ = sa.user_id_
         LEFT JOIN sys_user su ON cssp.user_id_ = su.id_