update

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

@@ -134,4 +134,7 @@ public interface StudentCourseHomeworkDao extends BaseDAO<Long, StudentCourseHom
     Set<Integer> checkStudentHaveHomeworkInDateRange(@Param("startDate") String startDate,
                                                      @Param("endDate") String endDate,
                                                      @Param("studentIds") List<Integer> studentIds);
+
+    List<StudentCourseHomework> queryAll(Map<String, Object> params);
+    int countAll(Map<String, Object> params);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseHomeworkDto.java

@@ -0,0 +1,20 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.CourseHomework;
+
+/**
+ * @Author Joburgess
+ * @Date 2020/11/17 0017
+ */
+public class CourseHomeworkDto extends CourseHomework {
+
+    private int repliedNum;
+
+    public int getRepliedNum() {
+        return repliedNum;
+    }
+
+    public void setRepliedNum(int repliedNum) {
+        this.repliedNum = repliedNum;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/SimpleUserDto.java

@@ -8,6 +8,8 @@ public class SimpleUserDto {
 
     private Integer userId;
 
+    private String nickName;
+
     private String userName;
 
     private String avatar;
@@ -66,6 +68,14 @@ public class SimpleUserDto {
         this.userId = userId;
     }
 
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
     public String getUserName() {
         return userName;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentCourseHomeworkDto.java

@@ -4,28 +4,29 @@ package com.ym.mec.biz.dal.dto;
 import java.util.Date;
 
 public class StudentCourseHomeworkDto {
+
+    private Integer studentId;
+
+    private String studentName;
+
     private String phone;
 
-    private String username;
+    private String subjectIds;
 
-    private String subjectName;
+    private String subjectNames;
 
     private String url;
 
+    private String attachments;
+
+    private Date submitTime;
+
     private Date createTime;
 
     private Integer isReplied;
 
     private Integer isView;
 
-    public String getSubjectName() {
-        return subjectName;
-    }
-
-    public void setSubjectName(String subjectName) {
-        this.subjectName = subjectName;
-    }
-
     public String getPhone() {
         return phone;
     }
@@ -34,12 +35,36 @@ public class StudentCourseHomeworkDto {
         this.phone = phone;
     }
 
-    public String getUsername() {
-        return username;
+    public Integer getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Integer studentId) {
+        this.studentId = studentId;
+    }
+
+    public String getAttachments() {
+        return attachments;
+    }
+
+    public void setAttachments(String attachments) {
+        this.attachments = attachments;
     }
 
-    public void setUsername(String username) {
-        this.username = username;
+    public Date getSubmitTime() {
+        return submitTime;
+    }
+
+    public void setSubmitTime(Date submitTime) {
+        this.submitTime = submitTime;
+    }
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
     }
 
     public String getUrl() {
@@ -66,6 +91,22 @@ public class StudentCourseHomeworkDto {
         this.isReplied = isReplied;
     }
 
+    public String getSubjectIds() {
+        return subjectIds;
+    }
+
+    public void setSubjectIds(String subjectIds) {
+        this.subjectIds = subjectIds;
+    }
+
+    public String getSubjectNames() {
+        return subjectNames;
+    }
+
+    public void setSubjectNames(String subjectNames) {
+        this.subjectNames = subjectNames;
+    }
+
     public Integer getIsView() {
         return isView;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherAttendancesDto.java

@@ -4,6 +4,7 @@ import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.enums.CourseStatusEnum;
 import com.ym.mec.biz.dal.enums.SignInStatusEnum;
 import com.ym.mec.biz.dal.enums.SignOutStatusEnum;
+import com.ym.mec.biz.dal.enums.TeachTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
@@ -13,6 +14,8 @@ public class TeacherAttendancesDto {
     @ApiModelProperty(value = "老师名",required = false)
 	private String teacherName;
 
+    private TeachTypeEnum teacherRole;
+
     @ApiModelProperty(value = "分部名",required = false)
 	private String organName;
 
@@ -109,6 +112,30 @@ public class TeacherAttendancesDto {
         this.courseScheduleName = courseScheduleName;
     }
 
+    public TeachTypeEnum getTeacherRole() {
+        return teacherRole;
+    }
+
+    public void setTeacherRole(TeachTypeEnum teacherRole) {
+        this.teacherRole = teacherRole;
+    }
+
+    public String getSignInLongitudeLatitude() {
+        return signInLongitudeLatitude;
+    }
+
+    public void setSignInLongitudeLatitude(String signInLongitudeLatitude) {
+        this.signInLongitudeLatitude = signInLongitudeLatitude;
+    }
+
+    public String getSignOutLongitudeLatitude() {
+        return signOutLongitudeLatitude;
+    }
+
+    public void setSignOutLongitudeLatitude(String signOutLongitudeLatitude) {
+        this.signOutLongitudeLatitude = signOutLongitudeLatitude;
+    }
+
     public CourseStatusEnum getCourseScheduleStatus() {
         return courseScheduleStatus;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/CourseHomeworkQueryInfo.java

@@ -24,9 +24,14 @@ public class CourseHomeworkQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "班级ID",required = false)
     private Long classGroupId;
 
+    @ApiModelProperty(value = "课程编号")
+    private Long courseScheduleId;
+
     @ApiModelProperty(value = "用户ID",required = false)
     private Long userId;
 
+    private Integer isReplied;
+
     private Date classDate;
 
     public Date getClassDate() {
@@ -69,6 +74,22 @@ public class CourseHomeworkQueryInfo extends QueryInfo {
         this.classGroupId = classGroupId;
     }
 
+    public Long getCourseScheduleId() {
+        return courseScheduleId;
+    }
+
+    public void setCourseScheduleId(Long courseScheduleId) {
+        this.courseScheduleId = courseScheduleId;
+    }
+
+    public Integer getIsReplied() {
+        return isReplied;
+    }
+
+    public void setIsReplied(Integer isReplied) {
+        this.isReplied = isReplied;
+    }
+
     public Long getUserId() {
         return userId;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/CourseHomeworkService.java

@@ -36,4 +36,4 @@ public interface CourseHomeworkService extends BaseService<Long, CourseHomework>
 	 * @return
 	 */
 	boolean delHomwworkByCourseScheduleId(List<Long> courseScheduleIdList);
-}
+}

mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleStudentPaymentService.java

@@ -11,6 +11,7 @@ import com.ym.mec.common.service.BaseService;
 import org.snaker.engine.access.Page;
 
 import java.util.List;
+import java.util.Map;
 
 public interface CourseScheduleStudentPaymentService extends BaseService<Long, CourseScheduleStudentPayment> {
 
@@ -67,6 +68,6 @@ public interface CourseScheduleStudentPaymentService extends BaseService<Long, C
 	 * @param queryInfo:
 	 * @return com.ym.mec.common.page.PageInfo<com.ym.mec.biz.dal.dto.CourseScheduleStudentListDto>
 	 */
-	PageInfo<CourseScheduleStudentListDto> queryCourseStudentList(CourseScheduleStudentPaymentQueryInfo queryInfo);
+	Map<String, Object> queryCourseStudentList(CourseScheduleStudentPaymentQueryInfo queryInfo);
 
 }

mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleTeacherSalaryService.java

@@ -1,9 +1,6 @@
 package com.ym.mec.biz.service;
 
-import com.ym.mec.biz.dal.dto.ExportTeacherSalaryDto;
-import com.ym.mec.biz.dal.dto.TeacherAttendanceDto;
-import com.ym.mec.biz.dal.dto.TeacherCourseSalaryDetail4WebDto;
-import com.ym.mec.biz.dal.dto.TeacherSalaryDto;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.CourseScheduleTeacherSalary;
 import com.ym.mec.biz.dal.entity.VipGroup;
@@ -175,5 +172,5 @@ public interface CourseScheduleTeacherSalaryService extends BaseService<Long, Co
      * @param courseScheduleId:
      * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherAttendanceDto>
      */
-    List<TeacherAttendanceDto> getCourseTeachers(Long courseScheduleId);
+    List<TeacherAttendancesDto> getCourseTeachers(Long courseScheduleId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/StudentCourseHomeworkService.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.dto.CourseHomeworkStudentDetailDto;
 import com.ym.mec.biz.dal.dto.StudentCourseHomeworkDto;
+import com.ym.mec.biz.dal.entity.CourseHomework;
 import com.ym.mec.biz.dal.entity.StudentCourseHomework;
 import com.ym.mec.biz.dal.page.CourseHomeworkQueryInfo;
 import com.ym.mec.common.page.PageInfo;
@@ -9,6 +10,7 @@ import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
 
 import java.util.List;
+import java.util.Map;
 
 public interface StudentCourseHomeworkService extends BaseService<Long, StudentCourseHomework> {
 
@@ -76,4 +78,13 @@ public interface StudentCourseHomeworkService extends BaseService<Long, StudentC
      * @param studentCourseHomework
      */
     void add(StudentCourseHomework studentCourseHomework);
+
+    /**
+     * @describe 获取课程作业详情
+     * @author Joburgess
+     * @date 2020/11/17 0017
+     * @param queryInfo:
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
+    Map<String, Object> getCourseHomeworkDetail(CourseHomeworkQueryInfo queryInfo);
 }

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

@@ -283,10 +283,11 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 	}
 
 	@Override
-	public PageInfo<CourseScheduleStudentListDto> queryCourseStudentList(CourseScheduleStudentPaymentQueryInfo queryInfo) {
+	public Map<String, Object> queryCourseStudentList(CourseScheduleStudentPaymentQueryInfo queryInfo) {
 		PageInfo<CourseScheduleStudentListDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);
+		List<StudentAttendance> studentAttendances = studentAttendanceDao.findByCourseId(queryInfo.getCourseScheduleId().longValue());
 
 		List<CourseScheduleStudentListDto> dataList = new ArrayList<>();
 		int count = courseScheduleStudentPaymentDao.countAll(params);
@@ -295,7 +296,6 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 			params.put("offset", pageInfo.getOffset());
 			List<CourseScheduleStudentPayment> courseScheduleStudentPayments = courseScheduleStudentPaymentDao.queryAll(params);
 			Set<Integer> studentIds = courseScheduleStudentPayments.stream().map(CourseScheduleStudentPayment::getUserId).collect(Collectors.toSet());
-			List<StudentAttendance> studentAttendances = studentAttendanceDao.findByCourseId(queryInfo.getCourseScheduleId().longValue());
 			List<SimpleUserDto> usersSimpleInfo = teacherDao.getUsersSimpleInfo(new ArrayList<>(studentIds));
 			List<Student> students = studentDao.findByStudentIds(new ArrayList<>(studentIds));
 			Set<Integer> subjectIds = new HashSet<>();
@@ -316,6 +316,7 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 			for (CourseScheduleStudentPayment courseScheduleStudentPayment : courseScheduleStudentPayments) {
 				CourseScheduleStudentListDto cssld=new CourseScheduleStudentListDto();
 				cssld.setStudentId(courseScheduleStudentPayment.getUserId());
+				cssld.setStudentName(studentInfoMap.containsKey(cssld.getStudentId())?studentInfoMap.get(cssld.getStudentId()).getNickName():"");
 				cssld.setPhone(studentInfoMap.containsKey(cssld.getStudentId())?studentInfoMap.get(cssld.getStudentId()).getPhone():"");
 				cssld.setSubjectIds(studentMap.containsKey(cssld.getStudentId())?studentMap.get(cssld.getStudentId()).getSubjectIdList():"");
 				if(StringUtils.isNotBlank(cssld.getSubjectIds())){
@@ -333,6 +334,20 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 			}
 		}
 		pageInfo.setRows(dataList);
-		return pageInfo;
+
+		Map<String, Object> result = new HashMap<>();
+		result.put("pageInfo", pageInfo);
+
+		if(queryInfo.getPage()==1){
+			Map<String, Integer> countInfo = new HashMap<>();
+			countInfo.put("totalStudentNum", count);
+			countInfo.put("signInStudentNum", (int) studentAttendances.stream().filter(s -> Objects.nonNull(s.getSignInTime())).count());
+			countInfo.put("leaveStudentNum", (int) studentAttendances.stream().filter(s -> StudentAttendanceStatusEnum.LEAVE.equals(s.getStatus())).count());
+			countInfo.put("truantStudentNum", (int) studentAttendances.stream().filter(s -> Objects.isNull(s.getStatus())||StudentAttendanceStatusEnum.TRUANT.equals(s.getStatus())).count());
+
+			result.put("countInfo", countInfo);
+		}
+
+		return result;
 	}
 }

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

@@ -1275,8 +1275,36 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
     }
 
     @Override
-    public List<TeacherAttendanceDto> getCourseTeachers(Long courseScheduleId) {
+    public List<TeacherAttendancesDto> getCourseTeachers(Long courseScheduleId) {
+        List<TeacherAttendancesDto> result = new ArrayList<>();
         List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries = courseScheduleTeacherSalaryDao.findByCourseSchedule(courseScheduleId);
-        return null;
+        if(CollectionUtils.isEmpty(courseScheduleTeacherSalaries)){
+            return result;
+        }
+        Set<Integer> teacherIds = courseScheduleTeacherSalaries.stream().map(CourseScheduleTeacherSalary::getUserId).collect(Collectors.toSet());
+        List<TeacherAttendance> teacherAttendances = teacherAttendanceDao.findByCourseSchedules(Arrays.asList(courseScheduleId));
+        Map<Integer, TeacherAttendance> idTeacherAttendanceMap = teacherAttendances.stream().collect(Collectors.toMap(TeacherAttendance::getTeacherId, t -> t, (t1, t2) -> t1));
+        List<SimpleUserDto> usersSimpleInfo = new ArrayList<>();
+        if(!CollectionUtils.isEmpty(teacherIds)){
+            usersSimpleInfo = teacherDao.getUsersSimpleInfo(new ArrayList<>(teacherIds));
+        }
+        Map<Integer, SimpleUserDto> idUserMap = usersSimpleInfo.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, s -> s));
+        for (CourseScheduleTeacherSalary courseScheduleTeacherSalary : courseScheduleTeacherSalaries) {
+            TeacherAttendancesDto t = new TeacherAttendancesDto();
+            t.setTeacherId(courseScheduleTeacherSalary.getUserId());
+            t.setTeacherName(idUserMap.containsKey(t.getTeacherId())?idUserMap.get(t.getTeacherId()).getUserName():"");
+            t.setTeacherRole(courseScheduleTeacherSalary.getTeacherRole());
+            if(idTeacherAttendanceMap.containsKey(t.getTeacherId())){
+                TeacherAttendance teacherAttendance = idTeacherAttendanceMap.get(t.getTeacherId());
+                t.setSignInTime(teacherAttendance.getSignInTime());
+                t.setSignInStatus(Objects.nonNull(teacherAttendance.getSignInStatus())?SignInStatusEnum.valueOf(teacherAttendance.getSignInStatus().getCode().toString()):SignInStatusEnum.NO);
+                t.setSignOutTime(teacherAttendance.getSignOutTime());
+                t.setSignOutStatus(Objects.nonNull(teacherAttendance.getSignOutStatus())?SignOutStatusEnum.valueOf(teacherAttendance.getSignOutStatus().getCode().toString()):SignOutStatusEnum.NO);
+                t.setSignInLongitudeLatitude(teacherAttendance.getSignInLongitudeLatitude());
+                t.setSignOutLongitudeLatitude(teacherAttendance.getSignOutLongitudeLatitude());
+            }
+            result.add(t);
+        }
+        return result;
     }
 }

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

@@ -3,10 +3,7 @@ package com.ym.mec.biz.service.impl;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
-import com.ym.mec.biz.dal.dto.CourseHomeworkStudentDetailDto;
-import com.ym.mec.biz.dal.dto.SimpleUserDto;
-import com.ym.mec.biz.dal.dto.StudentCourseHomeworkDto;
-import com.ym.mec.biz.dal.dto.StudentHomeworkRecordDto;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
@@ -24,6 +21,7 @@ import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
 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 org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -60,6 +58,10 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
     private TeacherDao teacherDao;
     @Autowired
     private StudentExtracurricularExercisesSituationDao studentExtracurricularExercisesSituationDao;
+    @Autowired
+    private StudentDao studentDao;
+    @Autowired
+    private SubjectDao subjectDao;
 
     @Override
     public BaseDAO<Long, StudentCourseHomework> getDAO() {
@@ -352,4 +354,73 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
             }
         }
     }
+
+    @Override
+    public Map<String, Object> getCourseHomeworkDetail(CourseHomeworkQueryInfo queryInfo) {
+        Map<String, Object> result = new HashMap<>();
+        PageInfo<StudentCourseHomeworkDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<String, Object>();
+        MapUtil.populateMap(params, queryInfo);
+
+        List<StudentCourseHomework> dataList = new ArrayList<>();
+        List<StudentCourseHomeworkDto> studentCourseHomeworkDtos = new ArrayList<>();
+        int count = studentCourseHomeworkDao.countAll(params);
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = studentCourseHomeworkDao.queryAll(params);
+            Set<Integer> studentIds = dataList.stream().map(StudentCourseHomework::getUserId).collect(Collectors.toSet());
+            List<SimpleUserDto> usersSimpleInfo = teacherDao.getUsersSimpleInfo(new ArrayList<>(studentIds));
+            List<Student> students = studentDao.findByStudentIds(new ArrayList<>(studentIds));
+            Set<Integer> subjectIds = new HashSet<>();
+            for (Student student : students) {
+                if(StringUtils.isBlank(student.getSubjectIdList())){
+                    continue;
+                }
+                Set<Integer> studentSubjectIds = Arrays.stream(student.getSubjectIdList().split(",")).mapToInt(Integer::valueOf).boxed().collect(Collectors.toSet());
+                subjectIds.addAll(studentSubjectIds);
+            }
+            List<Subject> subjects = new ArrayList<>();
+            if(!CollectionUtils.isEmpty(subjectIds)){
+                subjects = subjectDao.findBySubjectIds(new ArrayList<>(subjectIds));
+            }
+            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());
+                s.setStudentName(studentInfoMap.containsKey(s.getStudentId())?studentInfoMap.get(s.getStudentId()).getNickName():"");
+                s.setPhone(studentInfoMap.containsKey(s.getStudentId())?studentInfoMap.get(s.getStudentId()).getPhone():"");
+                s.setSubjectIds(studentMap.containsKey(s.getStudentId())?studentMap.get(s.getStudentId()).getSubjectIdList():"");
+                if(StringUtils.isNotBlank(s.getSubjectIds())){
+                    Set<Integer> studentSubjectIds = Arrays.stream(s.getSubjectIds().split(",")).mapToInt(Integer::valueOf).boxed().collect(Collectors.toSet());
+                    List<String> subjectNames = subjects.stream().filter(sj -> studentSubjectIds.contains(sj.getId())).map(Subject::getName).collect(Collectors.toList());
+                    s.setSubjectNames(StringUtils.join(subjectNames, ","));
+                }
+                s.setSubmitTime(studentCourseHomework.getSubmitTime());
+                s.setIsView(studentCourseHomework.getIsView().getCode());
+                s.setIsReplied(studentCourseHomework.getIsReplied().getCode());
+                s.setAttachments(studentCourseHomework.getAttachments());
+                studentCourseHomeworkDtos.add(s);
+            }
+        }
+        pageInfo.setRows(studentCourseHomeworkDtos);
+
+        if(queryInfo.getPage()==1){
+            CourseHomework courseHomework = courseHomeworkDao.findByCourseSchedule(queryInfo.getCourseScheduleId());
+            params.put("", 1);
+            int repliedNum = studentCourseHomeworkDao.queryCount(params);
+            CourseHomeworkDto courseHomeworkDto = new CourseHomeworkDto();
+            courseHomeworkDto.setExpectNum(courseHomework.getExpectNum());
+            courseHomeworkDto.setCompletedNum(courseHomework.getCompletedNum());
+            courseHomeworkDto.setRepliedNum(repliedNum);
+            courseHomeworkDto.setRepliedNum(repliedNum);
+            result.put("countInfo", courseHomeworkDto);
+        }
+
+        result.put("pageInfo", pageInfo);
+
+        return result;
+    }
 }

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

@@ -379,6 +379,28 @@
             </foreach>
     </select>
 
+    <sql id="queryAllCondition">
+        <where>
+            <if test="courseScheduleId!=null">
+                course_schedule_id_=#{courseScheduleId}
+            </if>
+            <if test="isReplied!=null">
+                is_replied_=#{isReplied}
+            </if>
+        </where>
+    </sql>
+
+    <select id="queryAll" resultMap="StudentCourseHomework">
+         SELECT * FROM student_course_homework
+         <include refid="queryAllCondition" />
+         ORDER BY id_
+         <include refid="global.limit"></include>
+    </select>
+    <select id="countAll" resultType="int">
+        SELECT COUNT(*) FROM student_course_homework
+        <include refid="queryAllCondition" />
+    </select>
+
     <delete id="delByCourseScheduleId">
 		DELETE FROM student_course_homework WHERE course_schedule_id_ = #{courseScheduleId} 
 	</delete>

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

@@ -390,6 +390,7 @@
     <select id="getUsersSimpleInfo" resultType="com.ym.mec.biz.dal.dto.SimpleUserDto">
         SELECT
             su.id_ userId,
+            su.username_ nickName,
             su.real_name_ userName,
             su.phone_ phone
         FROM sys_user su

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

@@ -37,20 +37,7 @@ public class CourseScheduleStudentPaymentController extends BaseController {
     @GetMapping("/queryCourseStudentList")
     @PreAuthorize("@pcs.hasPermissions('courseScheduleStudentPayment/queryCourseStudentList')")
     public HttpResponseResult queryCourseStudentList(CourseScheduleStudentPaymentQueryInfo queryInfo) {
-        PageInfo<CourseScheduleStudentListDto> pageInfo = courseScheduleStudentPaymentService.queryCourseStudentList(queryInfo);
-        List<CourseScheduleStudentListDto> courseScheduleStudentList = pageInfo.getRows();
-
-        Map<String, Integer> countInfo = new HashMap<>();
-        countInfo.put("totalStudentNum", courseScheduleStudentList.size());
-        countInfo.put("signInStudentNum", (int) courseScheduleStudentList.stream().filter(s -> Objects.nonNull(s.getSignInTime())).count());
-        countInfo.put("leaveStudentNum", (int) courseScheduleStudentList.stream().filter(s -> StudentAttendanceStatusEnum.LEAVE.equals(s.getStatus())).count());
-        countInfo.put("truantStudentNum", (int) courseScheduleStudentList.stream().filter(s -> StudentAttendanceStatusEnum.TRUANT.equals(s.getStatus())).count());
-
-        Map<String, Object> result = new HashMap<>();
-        result.put("pageInfo", pageInfo);
-        result.put("countInfo", countInfo);
-
-        return succeed(result);
+        return succeed(courseScheduleStudentPaymentService.queryCourseStudentList(queryInfo));
     }
 
 }

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

@@ -4,6 +4,7 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.CourseScheduleTeacherSalaryDao;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.dto.TeacherAttendancesDto;
 import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.enums.TeacherSalaryConfirmStatus;
 import com.ym.mec.biz.dal.page.CourseSalaryQueryInfo4Web;
@@ -105,4 +106,14 @@ public class CourseScheduleTeacherSalaryController extends BaseController {
         courseScheduleTeacherSalaryService.closeSalaryConfirm(month);
         return succeed();
     }
+
+    @ApiOperation(value = "获取指定课程上的教师信息")
+    @GetMapping("/getCourseTeachers")
+    @PreAuthorize("@pcs.hasPermissions('courseScheduleTeacherSalary/getCourseTeachers')")
+    public HttpResponseResult<List<TeacherAttendancesDto>> getCourseTeachers(Long courseScheduleId){
+        if(Objects.isNull(courseScheduleId)){
+            throw new BizException("请指定课程");
+        }
+        return succeed(courseScheduleTeacherSalaryService.getCourseTeachers(courseScheduleId));
+    }
 }

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

@@ -0,0 +1,47 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.biz.dal.dto.CourseScheduleStudentListDto;
+import com.ym.mec.biz.dal.enums.StudentAttendanceStatusEnum;
+import com.ym.mec.biz.dal.page.CourseHomeworkQueryInfo;
+import com.ym.mec.biz.dal.page.CourseScheduleStudentPaymentQueryInfo;
+import com.ym.mec.biz.service.StudentCourseHomeworkService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.page.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Author Joburgess
+ * @Date 2020/11/17 0017
+ */
+@RestController
+@RequestMapping("studentCourseHomework")
+@Api(tags = "学生课堂作业服务")
+public class StudentCourseHomeworkController extends BaseController {
+
+    @Autowired
+    private StudentCourseHomeworkService studentCourseHomeworkService;
+
+    @ApiOperation(value = "获取课程作业详情")
+    @GetMapping("/getCourseHomeworkDetail")
+    @PreAuthorize("@pcs.hasPermissions('studentCourseHomework/getCourseHomeworkDetail')")
+    public HttpResponseResult getCourseHomeworkDetail(CourseHomeworkQueryInfo queryInfo) {
+        if(Objects.isNull(queryInfo.getCourseScheduleId())){
+            throw new BizException("请指定课程");
+        }
+        return succeed(studentCourseHomeworkService.getCourseHomeworkDetail(queryInfo));
+    }
+
+}