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

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.dto.CourseHomeworkStudentDetailDto;
+import com.ym.mec.biz.dal.dto.StudentHomeworkRecordDto;
 import com.ym.mec.biz.dal.entity.StudentCourseHomework;
 import com.ym.mec.common.dal.BaseDAO;
 
@@ -79,6 +80,15 @@ public interface StudentCourseHomeworkDao extends BaseDAO<Long, StudentCourseHom
     List<StudentCourseHomework> queryNotDoneHomeworkList();
 
     /**
+     * @describe 根据课程查询学生作业记录
+     * @author Joburgess
+     * @date 2020/3/20
+     * @param courseIds:
+     * @return java.util.List<com.ym.mec.biz.dal.entity.StudentCourseHomework>
+     */
+    List<StudentCourseHomework> findByCourses(@Param("courseIds") List<Long> courseIds);
+
+    /**
      * count课程学员作业列表
      * @param params
      * @return
@@ -95,4 +105,7 @@ public interface StudentCourseHomeworkDao extends BaseDAO<Long, StudentCourseHom
     int delByCourseScheduleId(Long courseScheduleId);
     
     int batchDelByCourseScheduleId(@Param("courseScheduleIdList") List<Long> courseScheduleIdList);
+
+    int countStudentHomeworkRecord(Map<String, Object> params);
+    List<StudentHomeworkRecordDto> findStudentHomeworkRecord(Map<String, Object> params);
 }

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

@@ -20,6 +20,8 @@ public class CourseHomeworkStudentDetailDto {
     @ApiModelProperty(value = "作业ID",required = false)
     private Long courseHomeworkId;
 
+    private Long courseScheduleId;
+
     @ApiModelProperty(value = "学生作业编号",required = false)
     private Long studentCourseHomeworkId;
 
@@ -47,6 +49,54 @@ public class CourseHomeworkStudentDetailDto {
     @ApiModelProperty(value = "是否已经回复",required = false)
     private YesOrNoEnum isReplied;
 
+    private Integer studentId;
+
+    private String studentName;
+
+    private Integer teacherId;
+
+    private String teacherName;
+
+    public Long getCourseScheduleId() {
+        return courseScheduleId;
+    }
+
+    public void setCourseScheduleId(Long courseScheduleId) {
+        this.courseScheduleId = courseScheduleId;
+    }
+
+    public Integer getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Integer studentId) {
+        this.studentId = studentId;
+    }
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
+    public Integer getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Integer teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
     public Long getStudentCourseHomeworkId() {
         return studentCourseHomeworkId;
     }

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

@@ -0,0 +1,80 @@
+package com.ym.mec.biz.dal.dto;
+
+import java.util.Date;
+
+/**
+ * @Author Joburgess
+ * @Date 2020/3/20
+ */
+public class StudentHomeworkRecordDto {
+
+    private Integer studentCourseHomeworkId;
+
+    private Long courseScheduleId;
+
+    private String courseName;
+
+    private Date classDate;
+
+    private Integer teacherId;
+
+    private String teacherName;
+
+    private int status;
+
+    public Integer getStudentCourseHomeworkId() {
+        return studentCourseHomeworkId;
+    }
+
+    public void setStudentCourseHomeworkId(Integer studentCourseHomeworkId) {
+        this.studentCourseHomeworkId = studentCourseHomeworkId;
+    }
+
+    public Long getCourseScheduleId() {
+        return courseScheduleId;
+    }
+
+    public void setCourseScheduleId(Long courseScheduleId) {
+        this.courseScheduleId = courseScheduleId;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public Date getClassDate() {
+        return classDate;
+    }
+
+    public void setClassDate(Date classDate) {
+        this.classDate = classDate;
+    }
+
+    public Integer getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Integer teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+}

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

@@ -44,6 +44,16 @@ public class TeacherHomeworkListDto {
     @ApiModelProperty(value = "乐团名称")
     private String musicGroupName;
 
+    private int isReplied;
+
+    public int getIsReplied() {
+        return isReplied;
+    }
+
+    public void setIsReplied(int isReplied) {
+        this.isReplied = isReplied;
+    }
+
     public String getDay() {
         return day;
     }

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

@@ -27,6 +27,16 @@ public class CourseHomeworkQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "用户ID",required = false)
     private Long userId;
 
+    private Date classDate;
+
+    public Date getClassDate() {
+        return classDate;
+    }
+
+    public void setClassDate(Date classDate) {
+        this.classDate = classDate;
+    }
+
     public GroupType getGroupType() {
         return groupType;
     }

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.entity.StudentCourseHomework;
+import com.ym.mec.biz.dal.page.CourseHomeworkQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
@@ -59,4 +60,13 @@ public interface StudentCourseHomeworkService extends BaseService<Long, StudentC
      * @return
      */
     PageInfo<StudentCourseHomework> findStudentCourseHomeworks(QueryInfo queryInfo);
+
+    /**
+     * @describe 获取学生的作业记录
+     * @author Joburgess
+     * @date 2020/3/20
+     * @param queryInfo:
+     * @return com.ym.mec.common.page.PageInfo
+     */
+    PageInfo findStudentHomeworkRecord(CourseHomeworkQueryInfo queryInfo);
 }

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

@@ -5,7 +5,9 @@ import com.ym.mec.biz.dal.dao.StudentCourseHomeworkDao;
 import com.ym.mec.biz.dal.dto.Mapper;
 import com.ym.mec.biz.dal.dto.TeacherHomeworkListDto;
 import com.ym.mec.biz.dal.entity.CourseHomework;
+import com.ym.mec.biz.dal.entity.StudentCourseHomework;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.CourseHomeworkQueryInfo;
 import com.ym.mec.biz.service.CourseHomeworkService;
 import com.ym.mec.biz.service.SysMessageService;
@@ -13,11 +15,11 @@ import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
 import com.ym.mec.util.collection.MapUtil;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -51,22 +53,19 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
 		int count = courseHomeworkDao.countByClassGroupAndTeacher(params);
 		if (count > 0) {
 			dataList = courseHomeworkDao.findByClassGroupAndTeacher(params);
-			// List<Integer> courseScheduleIds=dataList.stream()
-			// .map(TeacherHomeworkListDto::getCourseScheduleId)
-			// .distinct()
-			// .collect(Collectors.toList());
-			// List<Map<Integer, Integer>> courseTimeByClassGroup = teacherAttendanceDao.findCourseTimeByCourseSchedules(courseScheduleIds);
-			// Map<Integer, Integer> map = MapUtil.convertIntegerMap(courseTimeByClassGroup);
-			// dataList.forEach(teacherHomeworkListDto -> {
-			// teacherHomeworkListDto.setCurrentClassTimes(map.get(teacherHomeworkListDto.getCourseScheduleId().longValue()));
-			// });
-			// List<Integer> courseScheduleIds = dataList.stream().map(TeacherHomeworkListDto::getCourseScheduleId).collect(Collectors.toList());
-			// if (!CollectionUtils.isEmpty(courseScheduleIds)) {
-			// Map<Integer, Integer> courseScheduleCurrentTimes = courseScheduleService.findCourseScheduleCurrentTimes(courseScheduleIds);
-			// dataList.forEach(teacherHomeworkListDto -> {
-			// teacherHomeworkListDto.setCurrentClassTimes(courseScheduleCurrentTimes.get(teacherHomeworkListDto.getCourseScheduleId()));
-			// });
-			// }
+			List<Long> courseIds = dataList.stream().mapToLong(TeacherHomeworkListDto::getCourseScheduleId).boxed().collect(Collectors.toList());
+			List<StudentCourseHomework> allStudentCourseHomeworks = studentCourseHomeworkDao.findByCourses(courseIds);
+			Map<Long, List<StudentCourseHomework>> homeworkStudentMap = allStudentCourseHomeworks.stream().collect(Collectors.groupingBy(StudentCourseHomework::getCourseScheduleId));
+			for (TeacherHomeworkListDto teacherHomeworkListDto : dataList) {
+				List<StudentCourseHomework> studentCourseHomeworks = homeworkStudentMap.get(teacherHomeworkListDto.getCourseScheduleId().longValue());
+				if(CollectionUtils.isEmpty(studentCourseHomeworks)){
+					continue;
+				}
+				Map<YesOrNoEnum, List<StudentCourseHomework>> replyStudentsMap = studentCourseHomeworks.stream().collect(Collectors.groupingBy(StudentCourseHomework::getIsReplied));
+				if(CollectionUtils.isEmpty(replyStudentsMap.get(YesOrNoEnum.NO))){
+					teacherHomeworkListDto.setIsReplied(YesOrNoEnum.YES.getCode());
+				}
+			}
 		}
 		if (count != 0) {
 			Map<String, List<TeacherHomeworkListDto>> collect = dataList.stream().collect(Collectors.groupingBy(TeacherHomeworkListDto::getDay));

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

@@ -3124,7 +3124,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
         CourseScheduleDto courseSchedules = courseScheduleDao.getCourseSchedules(courseScheduleComplaints.getCourseScheduleId());
         Date now = new Date();
-        if (!courseSchedules.getStatus().equals(CourseStatusEnum.OVER)) {
+        if (courseSchedules.getEndClassTime().after(now)) {
             throw new BizException("该课程还未结束");
         }
         int i = DateUtil.daysBetween(courseSchedules.getEndClassTime(), now);

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

@@ -356,18 +356,18 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
             throw new BizException("此课程组不存在");
         }
         if(coursesGroup.getStatus().equals(GroupStatusEnum.CANCEL)){
-            throw new BizException("此课程组已关闭");
+            throw new BizException("无法加入，此课程组已关闭");
         }
         List<ClassGroupStudentMapper> groupStudents = classGroupStudentMapperDao.findGroupStudents(courseGroupId.toString(), GroupType.COMM, userId, null);
         if(!CollectionUtils.isEmpty(groupStudents)){
-            throw new BizException("您已购买过此课程组");
+            throw new BizException("无法重复加入，您已在此课程组");
         }
 
         Date now=new Date();
 
         ClassGroup classGroup = classGroupDao.findByMusicGroupAndType(courseGroupId.toString(), GroupType.COMM.getCode());
         if(classGroup.getStudentNum()>=classGroup.getExpectStudentNum()){
-            throw new BizException("此课程组人数已达上限");
+            throw new BizException("无法加入，此课程组人数已达上限");
         }
 
         BigDecimal amount = coursesGroup.getTotalCoursesPrice();
@@ -440,7 +440,7 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
                         orderNo,
                         baseApiUrl+"/api-student/studentOrder/notify",
                         baseApiUrl+"/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
-                        "网管课购买",
+                        "对外课程组购买",
                         coursesGroup.getName(),
                         userId,
                         classFee,
@@ -579,7 +579,7 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
         List<CourseScheduleStudentPayment> courseScheduleStudentPayments = new ArrayList<>();
         List<CourseSchedule> groupNotStartCourses = courseScheduleDao.findGroupNotStartCourses(order.getMusicGroupId(), GroupType.COMM);
         if(CollectionUtils.isEmpty(groupNotStartCourses)){
-            throw new BizException("没有剩余课时");
+            throw new BizException("无法加入，此课程组已关闭");
         }
         BigDecimal singleCoursePrice = order.getExpectAmount().divide(new BigDecimal(groupNotStartCourses.size()), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN);
         for (CourseSchedule courseSchedule : groupNotStartCourses) {
@@ -598,7 +598,7 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
         try {
 //            contractService.transferPracticeCoursesContract(order.getUserId(),classGroup.getTotalClassTimes(),practiceGroup.getCoursesStartDate(),practiceGroup.getCoursesExpireDate(),order.getExpectAmount());
         } catch (Exception e) {
-            LOGGER.error("网管课[{}]购买协议错误:{}",order.getMusicGroupId(),e.getMessage(),e.getMessage());
+            LOGGER.error("对外课程组[{}]购买协议错误:{}",order.getMusicGroupId(),e.getMessage(),e.getMessage());
         }
 
         List<ImGroupMember> imGroupMemberList = new ArrayList<>();

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

@@ -4,6 +4,8 @@ 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.StudentHomeworkRecordDto;
 import com.ym.mec.biz.dal.entity.CourseHomework;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.CourseScheduleReview;
@@ -28,6 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, StudentCourseHomework> implements StudentCourseHomeworkService {
@@ -112,7 +115,19 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
         if (Objects.isNull(courseScheduleID)) {
             throw new BizException("作业不存在");
         }
-        return studentCourseHomeworkDao.findCourseHomeworkStudentDetail(courseScheduleID, userId);
+        CourseHomeworkStudentDetailDto courseHomeworkStudentDetail = studentCourseHomeworkDao.findCourseHomeworkStudentDetail(courseScheduleID, userId);
+        if(Objects.nonNull(courseHomeworkStudentDetail)){
+            SysUser student = teacherDao.getUser(userId.intValue());
+            courseHomeworkStudentDetail.setStudentId(userId.intValue());
+            courseHomeworkStudentDetail.setStudentName(student.getUsername());
+            CourseSchedule courseSchedule = courseScheduleDao.get(courseHomeworkStudentDetail.getCourseScheduleId());
+            if(Objects.nonNull(courseSchedule)){
+                SysUser teacher = teacherDao.getUser(courseSchedule.getActualTeacherId());
+                courseHomeworkStudentDetail.setTeacherId(courseSchedule.getActualTeacherId());
+                courseHomeworkStudentDetail.setTeacherName(teacher.getRealName());
+            }
+        }
+        return courseHomeworkStudentDetail;
     }
 
     @Override
@@ -180,4 +195,30 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
         pageInfo.setRows(dataList);
         return pageInfo;
     }
+
+    @Override
+    public PageInfo findStudentHomeworkRecord(CourseHomeworkQueryInfo queryInfo) {
+        PageInfo<StudentHomeworkRecordDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<>();
+        MapUtil.populateMap(params, queryInfo);
+
+        List<StudentHomeworkRecordDto> dataList = null;
+        int count = studentCourseHomeworkDao.countStudentHomeworkRecord(params);
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = studentCourseHomeworkDao.findStudentHomeworkRecord(params);
+            List<Integer> teacherIds = dataList.stream().map(StudentHomeworkRecordDto::getTeacherId).collect(Collectors.toList());
+            List<SimpleUserDto> teachers = teacherDao.findSimpleTeachers(teacherIds);
+            Map<Integer, String> idNameMap = teachers.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, u -> u.getUserName()));
+            for (StudentHomeworkRecordDto studentHomeworkRecordDto : dataList) {
+                studentHomeworkRecordDto.setTeacherName(idNameMap.get(studentHomeworkRecordDto.getTeacherId()));
+            }
+        }
+        if (count == 0) {
+            dataList = new ArrayList<>();
+        }
+        pageInfo.setRows(dataList);
+        return pageInfo;
+    }
 }

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

@@ -28,6 +28,7 @@
         <result column="musicGroupName" property="musicGroupName"/>
         <result column="classGroupName" property="classGroupName"/>
         <result column="courseHomeworkId" property="courseHomeworkId"/>
+        <result column="course_schedule_id_" property="courseScheduleId"/>
         <result column="studentCourseHomeworkId" property="studentCourseHomeworkId"/>
         <result column="content_" property="content"/>
         <result column="expiry_date_" property="expiryDate"/>
@@ -213,7 +214,8 @@
 			sch.attachments_,
 			sch.score_,
 			sch.status_,
-			sch.is_replied_
+			sch.is_replied_,
+			sch.course_schedule_id_
 		FROM
 			course_homework ch
 		LEFT JOIN student_course_homework sch ON ch.id_=sch.course_homework_id_
@@ -299,7 +301,45 @@
         ORDER BY sch.id_ DESC
         <include refid="global.limit"/>
     </select>
-    
+
+    <resultMap id="StudentHomeworkRecordDto" type="com.ym.mec.biz.dal.dto.StudentHomeworkRecordDto">
+        <result property="studentCourseHomeworkId" column="student_course_homework_id_"/>
+        <result property="courseScheduleId" column="course_schedule_id_"/>
+        <result property="courseName" column="course_name_"/>
+        <result property="classDate" column="class_date_"/>
+        <result property="teacherId" column="actual_teacher_id_"/>
+        <result property="status" column="status_"/>
+    </resultMap>
+    <select id="findStudentHomeworkRecord" resultMap="StudentHomeworkRecordDto">
+        SELECT
+            sch.id_ student_course_homework_id_,
+            sch.course_schedule_id_,
+            cs.name_ course_name_,
+            cs.class_date_,
+            cs.actual_teacher_id_,
+            sch.status_
+        FROM
+            student_course_homework sch
+            LEFT JOIN course_schedule cs ON cs.id_ = sch.course_schedule_id_
+        WHERE sch.user_id_=#{userId}
+        AND DATE_FORMAT(class_date_, '%Y-%m')=DATE_FORMAT(#{classDate}, '%Y-%m')
+    </select>
+    <select id="countStudentHomeworkRecord" resultType="int">
+        SELECT
+            COUNT(sch.id_)
+        FROM
+            student_course_homework sch
+            LEFT JOIN course_schedule cs ON cs.id_ = sch.course_schedule_id_
+        WHERE sch.user_id_=#{userId}
+        AND DATE_FORMAT(class_date_, '%Y-%m')=DATE_FORMAT(#{classDate}, '%Y-%m')
+    </select>
+    <select id="findByCourses" resultMap="StudentCourseHomework">
+        SELECT * FROM student_course_homework WHERE course_schedule_id_ IN
+        <foreach collection="courseIds" item="courseId" open="(" close=")" separator=",">
+            #{courseId}
+        </foreach>
+    </select>
+
     <delete id="delByCourseScheduleId">
 		DELETE FROM student_course_homework WHERE course_schedule_id_ = #{courseScheduleId} 
 	</delete>

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

@@ -7,6 +7,7 @@ import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.CourseHomeworkQueryInfo;
 import com.ym.mec.biz.service.StudentCourseHomeworkService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +59,17 @@ public class StudentCourseHomeworkController extends BaseController {
         return succeed(studentCourseHomeworkService.findCourseHomeworkStudentDetail(courseScheduleID,user.getId().longValue()));
     }
 
+    @ApiOperation(value = "获取学生作业记录")
+    @GetMapping(value = "/findStudentHomeworkRecord")
+    public HttpResponseResult findStudentHomeworkRecord(CourseHomeworkQueryInfo queryInfo){
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if(Objects.isNull(user)){
+            return failed(HttpStatus.FORBIDDEN,"请登录");
+        }
+        queryInfo.setUserId(user.getId().longValue());
+        return succeed(studentCourseHomeworkService.findStudentHomeworkRecord(queryInfo));
+    }
+
     @ApiOperation(value = "分页查询作业列表")
     @PostMapping(value = "/queryPage")
     public Object queryPage(@RequestBody(required = false) CourseHomeworkQueryInfo queryInfo){