Merge branch 'adapay_new' of http://git.dayaedu.com/yonge/mec into adapay_new

 Conflicts:

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

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

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

@@ -135,6 +135,10 @@ public interface StudentCourseHomeworkDao extends BaseDAO<Long, StudentCourseHom
                                                      @Param("endDate") String endDate,
                                                      @Param("studentIds") List<Integer> studentIds);
 
+    List<StudentCourseHomework> queryAll(Map<String, Object> params);
+
+    int countAll(Map<String, Object> params);
+
     /**
      * 获取作业的已回复数
      * @param homeWorkIds

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

@@ -1,17 +1,24 @@
 package com.ym.mec.biz.dal.dao;
 
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dto.*;
-
-import com.ym.mec.biz.dal.entity.StudentAttendance;
-import com.ym.mec.common.page.PageInfo;
-import com.ym.mec.common.page.QueryInfo;
-import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.ibatis.annotations.Param;
+
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dto.BasicUserDto;
+import com.ym.mec.biz.dal.dto.MusicGroupStudentSignDto;
+import com.ym.mec.biz.dal.dto.MusicGroupStudentsDto;
+import com.ym.mec.biz.dal.dto.StudentHasCourseDto;
+import com.ym.mec.biz.dal.dto.StudentListCourseDto;
+import com.ym.mec.biz.dal.dto.StudentManageAccountBaseInfoDto;
+import com.ym.mec.biz.dal.dto.StudentManageBaseInfoOfMusicGroupDto;
+import com.ym.mec.biz.dal.dto.StudentManageCourseListDto;
+import com.ym.mec.biz.dal.dto.StudentManageListDto;
+import com.ym.mec.biz.dal.dto.StudentManageVipGroupClassDto;
+import com.ym.mec.biz.dal.dto.StudentPaymentDto;
+
 /**
  * @Author Joburgess
  * @Date 2019/9/19
@@ -172,50 +179,12 @@ public interface StudentManageDao {
     int countStudentVipGroupClass(Map<String, Object> params);
 
     /**
-     * 查询有课的学员
-     * @return
-     */
-    Set<Integer> queryHasCourse(Map<String, Object> params);
-
-    /**
-     * 查询没课的学员
-     * @return
-     */
-    Set<Integer> queryNotCourse(Map<String, Object> params);
-
-    /**
-     * 查询有课的学员
-     * @return
-     */
-    Integer countHasCourse(Map<String, Object> params);
-
-    /**
-     * 查询没课的学员
-     * @return
-     */
-    Integer countNotCourse(Map<String, Object> params);
-
-    /**
-     * 获取用户是否有课
-     * @param userIds
-     * @return
-     */
-    List<Map<Integer, Boolean>> queryStudentHasCourse(@Param("userIds") List<Integer> userIds);
-
-    /**
      * 获取未激活，有课的列表
      * @return
      */
     List<StudentManageListDto> queryHasCourseStudent(Map<String, Object> params);
 
     /**
-     * 当前用户是否有课
-     * @param userId
-     * @return
-     */
-    Integer getHasCourse(Integer userId);
-
-    /**
      * 获取签到学员数
      * @param courseScheduleId
      * @param status
@@ -237,22 +206,6 @@ public interface StudentManageDao {
      */
     Integer countRepliedNum(Integer courseScheduleId);
 
-    List<StudentHasCourseDto> queryCourseStudent(@Param("userIds") Set<Integer> userIds);
-
-    /**
-     * 有陪练课的学员列表
-     * @param params
-     * @return
-     */
-    Set<Integer> queryHasPracticeCourse(Map<String, Object> params);
-
-    /**
-     * 没有陪练课的学员列表
-     * @param params
-     * @return
-     */
-    Set<Integer> queryNotPracticeCourse(Map<String, Object> params);
-
     /**
      * 是否有课map列表
      * @param userIds
@@ -295,4 +248,10 @@ public interface StudentManageDao {
      * @return
      */
     List<Map<Integer,Integer>> queryHasCourseMap(@Param("userIds") Set<Integer> userIds);
+    
+    /**
+     * 查询学生剩余课程
+     * @return
+     */
+    List<StudentListCourseDto> queryStudentRemianCourse(@Param("userIds") Set<Integer> userIds);
 }

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/StudentListCourseDto.java

@@ -0,0 +1,35 @@
+package com.ym.mec.biz.dal.dto;
+
+public class StudentListCourseDto {
+
+	private Integer userId;
+	
+	private Integer remainCourseNum;
+	
+	private Integer remainPracticeNum;
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	public Integer getRemainCourseNum() {
+		return remainCourseNum;
+	}
+
+	public void setRemainCourseNum(Integer remainCourseNum) {
+		this.remainCourseNum = remainCourseNum;
+	}
+
+	public Integer getRemainPracticeNum() {
+		return remainPracticeNum;
+	}
+
+	public void setRemainPracticeNum(Integer remainPracticeNum) {
+		this.remainPracticeNum = remainPracticeNum;
+	}
+	
+}

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;
 
@@ -47,6 +50,10 @@ public class TeacherAttendancesDto {
     @ApiModelProperty(value = "签退状态(1正常签到，0异常签到) ",required = false)
     private SignOutStatusEnum signOutStatus;
 
+    private String signInLongitudeLatitude;
+
+    private String signOutLongitudeLatitude;
+
     /** 备注 */
     @ApiModelProperty(value = "备注",required = false)
     private String remark;
@@ -105,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/dal/page/StudentManageQueryInfo.java

@@ -32,10 +32,6 @@ public class StudentManageQueryInfo extends QueryInfo {
 
     private Boolean isExport = false;
 
-    private Boolean hasCourse;
-
-    private Boolean hasPracticeCourse;
-
     private Integer serviceTag;
 
     private Integer operatingTag;
@@ -66,14 +62,6 @@ public class StudentManageQueryInfo extends QueryInfo {
         isExport = export;
     }
 
-    public Boolean getHasPracticeCourse() {
-        return hasPracticeCourse;
-    }
-
-    public void setHasPracticeCourse(Boolean hasPracticeCourse) {
-        this.hasPracticeCourse = hasPracticeCourse;
-    }
-
     public List<Integer> getUserIds() {
         return userIds;
     }
@@ -82,14 +70,6 @@ public class StudentManageQueryInfo extends QueryInfo {
         this.userIds = userIds;
     }
 
-    public Boolean getHasCourse() {
-        return hasCourse;
-    }
-
-    public void setHasCourse(Boolean hasCourse) {
-        this.hasCourse = hasCourse;
-    }
-
     public String getStudentName() {
         return studentName;
     }

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

@@ -1,10 +1,7 @@
 package com.ym.mec.biz.service;
 
-import com.ym.mec.biz.dal.dto.WebCourseHomeworkListDto;
 import com.ym.mec.biz.dal.entity.CourseHomework;
-import com.ym.mec.biz.dal.page.CourseHomeWorkTemplateQueryInfo;
 import com.ym.mec.biz.dal.page.CourseHomeworkQueryInfo;
-import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
 import java.util.List;
@@ -39,11 +36,4 @@ public interface CourseHomeworkService extends BaseService<Long, CourseHomework>
 	 * @return
 	 */
 	boolean delHomwworkByCourseScheduleId(List<Long> courseScheduleIdList);
-
-	/**
-	 * 管理端作业列表
-	 * @param queryInfo
-	 * @return
-	 */
-    PageInfo<WebCourseHomeworkListDto> queryHomePage(CourseHomeWorkTemplateQueryInfo queryInfo);
 }

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,8 +1,6 @@
 package com.ym.mec.biz.service;
 
-import com.ym.mec.biz.dal.dto.ExportTeacherSalaryDto;
-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;
@@ -167,4 +165,12 @@ public interface CourseScheduleTeacherSalaryService extends BaseService<Long, Co
      */
     List<CourseScheduleTeacherSalary> createTeacherCourseSalary(CourseSchedule courseSchedule, List<Integer> teacherIds);
 
+    /**
+     * @describe 获取指定课程上的教师信息
+     * @author Joburgess
+     * @date 2020/11/17 0017
+     * @param courseScheduleId:
+     * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherAttendanceDto>
+     */
+    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

@@ -1273,4 +1273,38 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             }
         }
     }
+
+    @Override
+    public List<TeacherAttendancesDto> getCourseTeachers(Long courseScheduleId) {
+        List<TeacherAttendancesDto> result = new ArrayList<>();
+        List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries = courseScheduleTeacherSalaryDao.findByCourseSchedule(courseScheduleId);
+        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,78 @@ 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);
+
+        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));
+            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){
+            params.put("isReplied", 1);
+            int repliedNum = studentCourseHomeworkDao.countAll(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/java/com/ym/mec/biz/service/impl/StudentManageServiceImpl.java

@@ -39,6 +39,7 @@ import com.ym.mec.biz.dal.dto.MusicGroupStudentSignDto;
 import com.ym.mec.biz.dal.dto.MusicGroupStudentsDto;
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
 import com.ym.mec.biz.dal.dto.Student4operating;
+import com.ym.mec.biz.dal.dto.StudentListCourseDto;
 import com.ym.mec.biz.dal.dto.StudentManageAccountBaseInfoDto;
 import com.ym.mec.biz.dal.dto.StudentManageBaseInfoOfMusicGroupDto;
 import com.ym.mec.biz.dal.dto.StudentManageCourseListDto;
@@ -117,58 +118,49 @@ public class StudentManageServiceImpl implements StudentManageService {
 
     @Override
     public PageInfo<StudentManageListDto> findStudentsByOrganId(StudentManageQueryInfo queryInfo) {
-        PageInfo<StudentManageListDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
-        Boolean hasCourse = queryInfo.getHasCourse();
-        Boolean hasPracticeCourse = queryInfo.getHasPracticeCourse();
-        Map<String, Object> params = new HashMap<>();
-        MapUtil.populateMap(params, queryInfo);
-        params.put("offset", pageInfo.getOffset());
-        int count = 0;
-        Set<Integer> paramUserIds = null;
-        if (hasPracticeCourse != null) {
-            //是否有陪练课
-            if (hasPracticeCourse) {
-                paramUserIds = studentManageDao.queryHasPracticeCourse(params);
-            } else {
-                paramUserIds = studentManageDao.queryNotPracticeCourse(params);
-            }
-            if (paramUserIds.size() == 0) {
-                return pageInfo;
-            }
-            params.put("userIds", paramUserIds);
-        }
-        if (hasCourse != null) {
-            if (hasCourse) {
-                paramUserIds = studentManageDao.queryHasCourse(params);
-                count = studentManageDao.countHasCourse(params);
-            } else {
-                paramUserIds = studentManageDao.queryNotCourse(params);
-                count = studentManageDao.countNotCourse(params);
-            }
-            if (paramUserIds.size() == 0) {
-                return pageInfo;
-            }
-            params.remove("offset");
-            params.put("userIds", paramUserIds);
-        } else {
-            count = studentManageDao.countStudentByOrganId(params);
-        }
-        if (queryInfo.getIsExport() && count > 50000) {
-            throw new BizException("数据集太大，不能导出.最大数据集不能超过50000");
-        }
-        List<StudentManageListDto> dataList = null;
-        if (count > 0) {
-            pageInfo.setTotal(count);
-            dataList = studentManageDao.findStudentsByOrganId(params);
-            Set<Integer> userIds = dataList.stream().map(StudentManageListDto::getUserId).collect(Collectors.toSet());
-            Set<Integer> organIds = dataList.stream().map(StudentManageListDto::getOrganId).collect(Collectors.toSet());
-            List<SysUserCashAccount> byUserIds = sysUserCashAccountDao.findByUserIds(userIds);
-            Map<Integer, SysUserCashAccount> collect = byUserIds.stream()
-                    .collect(Collectors.toMap(SysUserCashAccount::getUserId, sysUserCashAccount -> sysUserCashAccount));
-            Map<Integer, Integer> hasPracticeCourseMap = MapUtil.convertIntegerMap(studentManageDao.getHasPracticeCourse(userIds));
-            //获取用户分部
-            Map<Integer, String> organNames = MapUtil.convertMybatisMap(organizationDao.findOrganNameMapList(organIds));
-            //获取所在乐团
+        PageInfo<StudentManageListDto> pageInfo = new PageInfo<StudentManageListDto>(queryInfo.getPage(), queryInfo.getRows());
+		Map<String, Object> params = new HashMap<String, Object>();
+		MapUtil.populateMap(params, queryInfo);
+		
+		List<StudentManageListDto> dataList = null;
+		int count = studentManageDao.countStudentByOrganId(params);
+		if (count > 0) {
+			pageInfo.setTotal(count);
+			params.put("offset", pageInfo.getOffset());
+			dataList = studentManageDao.findStudentsByOrganId(params);
+		}
+		if (dataList == null) {
+			dataList = new ArrayList<StudentManageListDto>();
+		}
+		pageInfo.setRows(dataList);
+		
+        Set<Integer> userIds = dataList.stream().map(StudentManageListDto::getUserId).collect(Collectors.toSet());
+		
+		List<StudentListCourseDto> studentListCourseDtoList = studentManageDao.queryStudentRemianCourse(userIds);
+		Map<Integer,StudentListCourseDto> StudentListCourseDtoMap = studentListCourseDtoList.stream().collect(Collectors.toMap(StudentListCourseDto::getUserId, studentListCourseDto -> studentListCourseDto));
+		
+		StudentListCourseDto studentListCourseDto = null;
+		for(StudentManageListDto dto : dataList){
+			studentListCourseDto = StudentListCourseDtoMap.get(dto.getUserId());
+			if(studentListCourseDto != null){
+				if(studentListCourseDto.getRemainCourseNum() > 0){
+					dto.setHasCourse(YesOrNoEnum.YES);
+				}else{
+					dto.setHasCourse(YesOrNoEnum.NO);
+				}
+				if(studentListCourseDto.getRemainPracticeNum() > 0){
+					dto.setHasPracticeCourse(YesOrNoEnum.YES);
+				}else{
+					dto.setHasPracticeCourse(YesOrNoEnum.NO);
+				}
+			}
+		}
+		
+		if (queryInfo.getIsExport()) {
+			if (count > 50000) {
+				throw new BizException("数据集太大，不能导出.最大数据集不能超过50000");
+			}
+			//获取所在乐团
             Map<Integer, String> musicGroupNames = MapUtil.convertMybatisMap(musicGroupDao.queryUserMusicNames(userIds));
             //获取所在vip
             Map<Integer, String> vipGroupNames = MapUtil.convertMybatisMap(vipGroupDao.queryUserVipNames(userIds));
@@ -176,38 +168,14 @@ public class StudentManageServiceImpl implements StudentManageService {
             Map<Integer, String> musicGroupStatus = MapUtil.convertMybatisMap(musicGroupDao.queryUserMusicStatus(userIds));
             //获取所在vip状态
             Map<Integer, String> vipGroupStatus = MapUtil.convertMybatisMap(vipGroupDao.queryUserVipStatus(userIds));
-            //获取所在声部
-            Map<Integer, String> subjectNames = MapUtil.convertMybatisMap(studentManageDao.querySubjectNames(userIds));
-            //学员是否有课
-            Map<Integer, Integer> hasCourseMap = MapUtil.convertMybatisMap(studentManageDao.queryHasCourseMap(userIds));
+            
             dataList.forEach(e -> {
-                e.setOrganName(organNames.get(e.getOrganId()));
                 e.setMusicGroupName(musicGroupNames.get(e.getUserId().longValue()));
                 e.setVipGroupName(vipGroupNames.get(e.getUserId()));
-                e.setSubjectName(subjectNames.get(e.getUserId().longValue()));
                 e.setMusicGroupStatus(musicGroupStatus.get(e.getUserId().longValue()));
                 e.setVipGroupStatus(vipGroupStatus.get(e.getUserId()));
-                e.setHasCourse(hasCourseMap.get(e.getUserId()) == null ? YesOrNoEnum.NO : YesOrNoEnum.YES);
-                /*if(hasCourse == null){
-                    Integer course = studentManageDao.getHasCourse(e.getUserId());
-                    e.setHasCourse(course==null?YesOrNoEnum.NO:course==0?YesOrNoEnum.NO:YesOrNoEnum.YES);
-                }else {
-                    if(hasCourse){
-                        e.setHasCourse(YesOrNoEnum.YES);
-                    }else {
-                        e.setHasCourse(YesOrNoEnum.NO);
-                    }
-                }*/
-                e.setHasPracticeCourse(hasPracticeCourseMap.get(e.getUserId()) == null ? YesOrNoEnum.NO : YesOrNoEnum.YES);
-                if (collect.get(e.getUserId()) != null) {
-                    e.setCourseBalance(collect.get(e.getUserId()).getCourseBalance());
-                }
             });
-        }
-        if (count == 0) {
-            dataList = new ArrayList<>();
-        }
-        pageInfo.setRows(dataList);
+		}
         return pageInfo;
     }
 
@@ -528,7 +496,9 @@ public class StudentManageServiceImpl implements StudentManageService {
         if (sysUser1 != null && !userId.equals(sysUser1.getId())) {
             throw new BizException("手机号已被占用");
         }
-        teacherDao.updateUser(student);
+        sysUserFeignService.updateSysUser(student);
+
+        student.setUserId(student.getId());
         student.setOperatingTag(student.getOperatingTag());
         student.setOperatingTempTag(0);
         student.setServiceTag(student.getServiceTag() == 0 ? 2 : 1);

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_

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

@@ -285,9 +285,9 @@
         SELECT COUNT(id_) FROM course_schedule_student_payment WHERE course_schedule_id_ = #{search}
     </select>
     <resultMap id="StudentCourseHomeworkDtoMap" type="com.ym.mec.biz.dal.dto.StudentCourseHomeworkDto">
-        <result column="username_" property="username"/>
+        <result column="username_" property="studentName"/>
         <result column="phone_" property="phone"/>
-        <result column="subject_name_" property="subjectName"/>
+        <result column="subject_name_" property="subjectNames"/>
         <result column="attachments_" property="url"/>
         <result column="is_replied_" property="isReplied"/>
         <result column="is_view_" property="isView"/>
@@ -389,6 +389,28 @@
         GROUP BY sch.course_homework_id_
     </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/StudentManageDao.xml

@@ -28,6 +28,42 @@
         <result property="courseBalance" column="course_balance_"/>
     </resultMap>
 
+    <resultMap id="StudentListCourseDto" type="com.ym.mec.biz.dal.dto.StudentListCourseDto">
+        <result property="userId" column="userId"/>
+        <result property="remainCourseNum" column="remainCourseNum"/>
+        <result property="remainPracticeNum" column="remainPracticeNum"/>
+    </resultMap>
+    
+    <resultMap id="studentManageListDto" type="com.ym.mec.biz.dal.dto.StudentManageListDto">
+        <result property="userId" column="user_id_"/>
+        <result property="realName" column="real_name_"/>
+        <result property="nation" column="nation_"/>
+        <result property="parentsPhone" column="parents_phone_"/>
+        <result property="parentsName" column="real_name_"/>
+        <result property="gender" column="gender_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result property="username" column="username_"/>
+        <result property="birthdate" column="birthdate_"/>
+        <result property="currentGrade" column="current_grade_"/>
+        <result property="currentClass" column="current_class_"/>
+        <result property="isActive" column="isActive_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result property="hasCourse" column="hasCourse_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result property="hasPracticeCourse" column="hasPracticeCourse_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result property="musicGroupName" column="music_group_name_"/>
+        <result property="musicGroupStatus" column="music_group_status_"/>
+        <result property="vipGroupName" column="vip_group_name_"/>
+        <result property="vipGroupStatus" column="vip_group_status_"/>
+        <result property="organName" column="organ_name_"/>
+        <result property="organId" column="organ_id_"/>
+        <result property="subjectName" column="music_group_subject_"/>
+        <result property="courseBalance" column="course_balance_"/>
+        <result property="balance" column="balance_"/>
+        <result property="serviceTag" column="service_tag_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result property="operatingTag" column="operating_tag_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result property="teacherName" column="teacher_name_"/>
+        <result property="teacherId" column="teacher_id_"/>
+        <result property="subjectIdList" column="subject_id_list_"/>
+    </resultMap>
+
     <sql id="queryCondition">
         <where>
             cgsm.user_id_ IS NOT NULL
@@ -112,21 +148,20 @@
     </update>
 
     <select id="findStudentsByOrganId" resultMap="studentManageListDto">
-        SELECT su.id_ user_id_,su.username_,su.gender_,su.phone_ parents_phone_,su.real_name_,
-        su.birthdate_,su.nation_,su.organ_id_,
-        CASE WHEN su.password_ IS NULL THEN 0 ELSE 1 END isActive_,
-        IF(st.service_tag_=2,0,st.service_tag_) service_tag_,st.operating_tag_,tu.real_name_ teacher_name_,st.teacher_id_,st.subject_id_list_,suca.balance_
-        FROM sys_user su
-        LEFT JOIN student st ON st.user_id_ = su.id_
-        LEFT JOIN sys_user tu ON tu.id_ = st.teacher_id_
-        LEFT JOIN sys_user_cash_account suca ON su.id_ = suca.user_id_
+        SELECT o.`name_` organ_name_,s.`user_id_` ,su.`username_` ,su.`phone_` parents_phone_,su.`real_name_` ,su.`gender_` , su.organ_id_,
+		tu.`username_` teacher_name_,s.`service_tag_` ,s.`operating_tag_` , suca.`course_balance_` ,sub.`name_` music_group_subject_ ,su.birthdate_,s.subject_id_list_,s.teacher_id_
+		FROM `student` s LEFT JOIN `sys_user` su on s.`user_id_` = su.`id_`
+		LEFT JOIN `organization` o on o.`id_` = su.`organ_id_`
+		LEFT JOIN `sys_user` tu on tu.`id_` = s.`teacher_id_` 
+		LEFT JOIN `sys_user_cash_account` suca on suca.`user_id_` = s.`user_id_`
+		LEFT JOIN `subject` sub on sub.id_ = s.`subject_id_list_`
         <include refid="findStudentsByOrganIdSql"/>
         ORDER BY su.create_time_ DESC
         <include refid="global.limit"/>
     </select>
     <sql id="findStudentsByOrganIdSql">
         <where>
-                su.user_type_ LIKE '%STUDENT%' AND su.del_flag_ = 0
+                su.del_flag_ = 0
             <if test="organId != null and organId != ''">
                 AND FIND_IN_SET(su.organ_id_,#{organId})
             </if>
@@ -140,31 +175,21 @@
                 AND su.password_ is null
             </if>
             <if test="operatingTag != null">
-                AND st.operating_tag_ = #{operatingTag}
+                AND s.operating_tag_ = #{operatingTag}
             </if>
             <if test="serviceTag != null">
-                AND st.service_tag_ = #{serviceTag}
+                AND s.service_tag_ = #{serviceTag}
             </if>
             <if test="teacherId != null">
-                AND st.teacher_id_ = #{teacherId}
-            </if>
-            <if test="userIds != null">
-                AND su.id_ IN
-                <foreach collection="userIds" open="(" close=")" separator="," item="item">
-                    #{item}
-                </foreach>
+                AND s.teacher_id_ = #{teacherId}
             </if>
         </where>
     </sql>
 
     <select id="countStudentByOrganId" resultType="java.lang.Integer">
         SELECT COUNT(DISTINCT su.id_)
-        FROM sys_user su
-        LEFT JOIN student_registration sr ON su.id_ = sr.user_id_
-        LEFT JOIN practice_lesson_apply pla ON su.id_ = pla.user_id_
-        LEFT JOIN student st ON st.user_id_ = su.id_
-        WHERE su.user_type_ LIKE '%STUDENT%' AND su.del_flag_ = 0
-        <include refid="queryHasCourseSql"/>
+        FROM `student` s LEFT JOIN `sys_user` su on s.`user_id_` = su.`id_`
+       <include refid="findStudentsByOrganIdSql"/>
     </select>
     <select id="findStudentBaseInfoByUserID" resultMap="studentManageListDto">
         SELECT su.username_,su.gender_,su.birthdate_,su.real_name_,su.id_ user_id_,
@@ -610,98 +635,6 @@
             AND st.teacher_id_ = #{teacherId}
         </if>
     </sql>
-    <select id="queryHasCourse" resultType="java.lang.Integer">
-        SELECT su.id_ FROM sys_user su
-        LEFT JOIN course_schedule_student_payment cssp ON cssp.user_id_ = su.id_
-        LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
-        LEFT JOIN practice_lesson_apply pla ON su.id_ = pla.user_id_
-        LEFT JOIN student st ON st.user_id_ = su.id_
-        WHERE su.user_type_ LIKE '%STUDENT%' AND cs.status_ != 'OVER' AND su.del_flag_ = 0
-        <include refid="queryHasCourseSql"/>
-        GROUP BY su.id_
-        ORDER BY su.create_time_ DESC
-        <include refid="global.limit"/>
-    </select>
-    <select id="countHasCourse" resultType="java.lang.Integer">
-        SELECT COUNT(DISTINCT su.id_) FROM sys_user su
-        LEFT JOIN course_schedule_student_payment cssp ON cssp.user_id_ = su.id_
-        LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
-        LEFT JOIN practice_lesson_apply pla ON su.id_ = pla.user_id_
-        LEFT JOIN student st ON st.user_id_ = su.id_
-        WHERE su.user_type_ LIKE '%STUDENT%' AND cs.status_ != 'OVER' AND su.del_flag_ = 0
-        <include refid="queryHasCourseSql"/>
-    </select>
-    <select id="queryNotCourse" resultType="java.lang.Integer">
-        SELECT su.id_ FROM sys_user su
-        LEFT JOIN course_schedule_student_payment cssp ON cssp.user_id_ = su.id_
-        LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_ AND cs.status_ != 'OVER'
-        LEFT JOIN practice_lesson_apply pla ON su.id_ = pla.user_id_
-        LEFT JOIN student st ON st.user_id_ = su.id_
-        <include refid="queryNotCourseSql"/>
-        GROUP BY su.id_
-        HAVING COUNT(cs.id_) = 0
-        ORDER BY su.create_time_ DESC
-        <include refid="global.limit"/>
-    </select>
-    <select id="countNotCourse" resultType="java.lang.Integer">
-        SELECT COUNT(e.id_) FROM (SELECT su.id_ FROM sys_user su
-        LEFT JOIN course_schedule_student_payment cssp ON cssp.user_id_ = su.id_
-        LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_ AND cs.status_ != 'OVER'
-        LEFT JOIN practice_lesson_apply pla ON su.id_ = pla.user_id_
-        LEFT JOIN student st ON st.user_id_ = su.id_
-        <include refid="queryNotCourseSql"/>
-        GROUP BY su.id_
-        HAVING COUNT(cs.id_) = 0)e
-    </select>
-    <sql id="queryNotCourseSql">
-        <where>
-                su.user_type_ LIKE '%STUDENT%' AND su.del_flag_ = 0
-            <if test="userIds != null">
-                AND su.id_ IN
-                <foreach collection="userIds" open="(" close=")" separator="," item="item">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="organId != null">
-                AND FIND_IN_SET(su.organ_id_,#{organId})
-            </if>
-            <if test="search != null and search != ''">
-                AND (su.phone_ LIKE CONCAT('%',#{search},'%') OR su.username_ LIKE CONCAT('%',#{search},'%') OR su.id_ LIKE CONCAT('%',#{search},'%'))
-            </if>
-            <if test="isActive != null and isActive == true">
-                and su.password_ is not null
-            </if>
-            <if test="isActive != null and isActive == false">
-                and su.password_ is null
-            </if>
-            <if test="isMake != null and isMake == true">
-                and pla.id_ IS NOT NULL
-            </if>
-            <if test="isMake != null and isMake == false">
-                and pla.id_ IS NULL
-            </if>
-            <if test="operatingTag != null">
-                AND st.operating_tag_ = #{operatingTag}
-            </if>
-            <if test="serviceTag != null">
-                AND st.service_tag_ = #{serviceTag}
-            </if>
-        </where>
-    </sql>
-    <select id="queryStudentHasCourse" resultType="java.util.Map">
-        SELECT cssp.user_id_ 'key',CASE WHEN COUNT(cssp.id_ AND cs.status_ != 'OVER') = 0 THEN 0 ELSE 1 END 'value'
-        FROM course_schedule_student_payment cssp
-        LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
-        <where>
-            <if test="userIds != null">
-                cssp.user_id_ IN
-                <foreach collection="userIds" open="(" close=")" separator="," item="item">
-                    #{item}
-                </foreach>
-            </if>
-        </where>
-        GROUP BY cssp.user_id_
-    </select>
     <resultMap id="StudentHasCourseDtoMap" type="com.ym.mec.biz.dal.dto.StudentHasCourseDto">
         <result property="userName" column="username_"/>
         <result property="musicGroupName" column="music_group_name_"/>
@@ -712,47 +645,7 @@
         <result property="isActive" column="is_active_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="isMake" column="is_make_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
-    <select id="queryCourseStudent" resultMap="StudentHasCourseDtoMap">
-        SELECT su.id_,su.username_,o.name_ organ_name_,
-        CASE WHEN su.password_ IS NULL THEN 0 ELSE 1 END is_active_,
-        CASE WHEN pla.id_ IS NULL THEN 0 ELSE 1 END is_make_
-        FROM sys_user su
-        LEFT JOIN organization o ON su.organ_id_ = o.id_
-        LEFT JOIN practice_lesson_apply pla ON pla.user_id_ = su.id_
-        WHERE su.id_ IN
-        <foreach collection="userIds" separator="," open="(" close=")" item="item">
-            #{item}
-        </foreach>
-    </select>
-    <resultMap id="studentManageListDto" type="com.ym.mec.biz.dal.dto.StudentManageListDto">
-        <result property="userId" column="user_id_"/>
-        <result property="realName" column="real_name_"/>
-        <result property="nation" column="nation_"/>
-        <result property="parentsPhone" column="parents_phone_"/>
-        <result property="parentsName" column="real_name_"/>
-        <result property="gender" column="gender_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result property="username" column="username_"/>
-        <result property="birthdate" column="birthdate_"/>
-        <result property="currentGrade" column="current_grade_"/>
-        <result property="currentClass" column="current_class_"/>
-        <result property="isActive" column="isActive_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result property="hasCourse" column="hasCourse_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result property="hasPracticeCourse" column="hasPracticeCourse_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result property="musicGroupName" column="music_group_name_"/>
-        <result property="musicGroupStatus" column="music_group_status_"/>
-        <result property="vipGroupName" column="vip_group_name_"/>
-        <result property="vipGroupStatus" column="vip_group_status_"/>
-        <result property="organName" column="organ_name_"/>
-        <result property="organId" column="organ_id_"/>
-        <result property="subjectName" column="music_group_subject_"/>
-        <result property="courseBalance" column="course_balance_"/>
-        <result property="balance" column="balance_"/>
-        <result property="serviceTag" column="service_tag_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result property="operatingTag" column="operating_tag_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result property="teacherName" column="teacher_name_"/>
-        <result property="teacherId" column="teacher_id_"/>
-        <result property="subjectIdList" column="subject_id_list_"/>
-    </resultMap>
+    
     <select id="queryHasCourseStudent" resultMap="studentManageListDto">
         SELECT su.id_ user_id_,su.username_,su.gender_,GROUP_CONCAT(DISTINCT sr.parents_name_)parents_name_,
         GROUP_CONCAT(DISTINCT sr.parents_phone_)parents_phone_,
@@ -818,12 +711,6 @@
         </if>
         GROUP BY su.id_
     </select>
-    <select id="getHasCourse" resultType="java.lang.Integer">
-        SELECT COUNT(DISTINCT su.id_) FROM sys_user su
-        LEFT JOIN course_schedule_student_payment cssp ON cssp.user_id_ = su.id_
-        LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
-        WHERE cs.status_ != 'OVER' AND su.id_ = #{userId}
-    </select>
     <select id="countStudentSignInNum" resultType="java.lang.Integer">
         SELECT COUNT(id_) FROM student_attendance WHERE course_schedule_id_ = #{courseScheduleId} AND status_ = #{status}
     </select>
@@ -848,19 +735,6 @@
             AND su.password_ IS NULL
         </if>
     </sql>
-    <select id="queryHasPracticeCourse" resultType="java.lang.Integer">
-        SELECT DISTINCT su.id_ FROM sys_user su
-        LEFT JOIN course_schedule_student_payment cssp ON cssp.user_id_ = su.id_
-        WHERE su.user_type_ LIKE '%STUDENT%' AND su.del_flag_ = 0 AND cssp.group_type_ = 'PRACTICE'
-        <include refid="queryHasPracticeCourseSql"/>
-    </select>
-    <select id="queryNotPracticeCourse" resultType="java.lang.Integer">
-        SELECT DISTINCT su.id_ FROM sys_user su
-        WHERE su.id_ NOT IN
-        (SELECT DISTINCT cssp.user_id_ FROM course_schedule_student_payment cssp WHERE cssp.group_type_ = 'PRACTICE')
-        AND su.user_type_ LIKE '%STUDENT%' AND su.del_flag_ = 0
-        <include refid="queryHasPracticeCourseSql"/>
-    </select>
     <select id="getHasPracticeCourse" resultType="java.util.Map">
         SELECT cssp.user_id_ 'key',COUNT(DISTINCT cssp.user_id_) 'value' FROM course_schedule_student_payment cssp
         WHERE cssp.group_type_ = 'PRACTICE' AND cssp.user_id_ IN
@@ -914,5 +788,15 @@
         </foreach>
         GROUP BY su.id_
     </select>
+    
+    <select id="queryStudentRemianCourse" resultMap="StudentListCourseDto">
+    	SELECT cssp.`user_id_` userId,count(cssp.`id_`) remainCourseNum,sum(case when cs.`group_type_` = 'PRACTICE' then 1 else 0 end) remainPracticeNum  
+    	FROM `course_schedule_student_payment` cssp LEFT JOIN `course_schedule` cs on cssp.`course_schedule_id_` = cs.`id_`
+		WHERE cs.`status_` = 'NOT_START' AND cssp.`user_id_` IN
+        <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
+            #{userId}
+        </foreach>
+		GROUP BY cssp.`user_id_`
+    </select>
 
 </mapper>

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));
+    }
+
+}