add:课后作业相关接口添加学生id和老师id字段

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseHomeworkServiceImpl.java

@@ -14,7 +14,6 @@ import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.CourseHomeworkService;
 import com.yonge.cooleshow.biz.dal.service.CourseScheduleService;
-import com.yonge.cooleshow.biz.dal.service.StudentAttendanceService;
 import com.yonge.cooleshow.biz.dal.service.StudentCourseHomeworkService;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo;
@@ -38,9 +37,6 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
     private CourseScheduleService courseScheduleService;
 
     @Autowired
-    private StudentAttendanceService studentAttendanceService;
-
-    @Autowired
     private StudentCourseHomeworkService studentCourseHomeworkService;
 
 	@Override
@@ -65,10 +61,12 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
         // 声部信息
         List<CourseHomeworkVo> subjectList = baseMapper.selectSubjectInfoList(records);
         for (int i = 0; i < records.size(); i++) {
+            records.get(i).setStudentId(studentInfoList.get(i).getStudentId());
             records.get(i).setStudentAvatar(studentInfoList.get(i).getStudentAvatar());
             records.get(i).setStudentName(studentInfoList.get(i).getStudentName());
             records.get(i).setSubjectName(subjectList.get(i).getSubjectName());
             records.get(i).setTeacherAvatar(teacherInfoList.get(i).getTeacherAvatar());
+            records.get(i).setTeacherId(teacherInfoList.get(i).getTeacherId());
             records.get(i).setTeacherName(teacherInfoList.get(i).getTeacherName());
             records.get(i).setAbsenteeism(teacherInfoList.get(i).getAbsenteeism());
         }
@@ -90,9 +88,11 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
                 .selectSubjectAndTeacherInfo(courseHomeworkDetailVo.getCourseGroupId());
 
         // 拼接数据
+        courseHomeworkDetailVo.setStudentId(studentInfoDetailVo.getStudentId());
         courseHomeworkDetailVo.setStudentName(studentInfoDetailVo.getStudentName());
         courseHomeworkDetailVo.setStudentAvatar(studentInfoDetailVo.getStudentAvatar());
         courseHomeworkDetailVo.setSubjectName(subjectAndTeacherInfoVo.getSubjectName());
+        courseHomeworkDetailVo.setTeacherId(subjectAndTeacherInfoVo.getTeacherId());
         courseHomeworkDetailVo.setTeacherAvatar(subjectAndTeacherInfoVo.getTeacherAvatar());
         courseHomeworkDetailVo.setTeacherName(subjectAndTeacherInfoVo.getTeacherName());
         return courseHomeworkDetailVo;
@@ -174,7 +174,18 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
         if (YesOrNoEnum.YES.getCode().equals(courseHomeworkDetailVo.getReviewHomework().getCode())) {
             throw  new BizException("老师已经点评作业，不能在提交");
         }
-        return studentCourseHomeworkService.submitCourseHome(courseHomeworkDetailVo,submitDto.getSubmit(),submitDto.getStudentId());
+        boolean submitCourseHome = studentCourseHomeworkService
+                .submitCourseHome(courseHomeworkDetailVo, submitDto.getSubmit(),submitDto.getStudentId());
+        if (submitCourseHome) {
+            CourseHomework courseHomework = this.getById(courseHomeworkDetailVo.getId());
+            if (courseHomework.getCompletedNum() == null) {
+                courseHomework.setCompletedNum(0);
+            }
+            courseHomework.setCompletedNum(courseHomework.getCompletedNum() + 1);
+            return this.updateById(courseHomework);
+        } else {
+            return false;
+        }
 
     }
 
@@ -184,9 +195,9 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
 
         List<CourseHomeworkVo> records = courseHomeworkVoIPage.getRecords();
         List<Long> courseIdList = records
-                                                  .stream()
-                                                  .map(CourseHomeworkVo::getCourseId)
-                                                  .collect(Collectors.toList());
+                      .stream()
+                      .map(CourseHomeworkVo::getCourseId)
+                      .collect(Collectors.toList());
         if (CollectionUtils.isEmpty(courseIdList)) {
             return courseHomeworkVoIPage;
         }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/CourseHomeworkDetailVo.java

@@ -74,12 +74,18 @@ public class CourseHomeworkDetailVo {
     @ApiModelProperty("声部名称")
     private String subjectName;
 
+    @ApiModelProperty("学生id")
+    private Long studentId;
+
     @ApiModelProperty("学员姓名")
     private String studentName;
 
     @ApiModelProperty("学员头像")
     private String studentAvatar;
 
+    @ApiModelProperty("老师id")
+    private Long teacherId;
+
     @ApiModelProperty("老师姓名")
     private String teacherName;
 
@@ -99,6 +105,21 @@ public class CourseHomeworkDetailVo {
     private Date decorateTime;
 
 
+    public Long getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Long studentId) {
+        this.studentId = studentId;
+    }
+
+    public Long getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Long teacherId) {
+        this.teacherId = teacherId;
+    }
 
     public String getTeacherName() {
         return teacherName;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/CourseHomeworkVo.java

@@ -42,12 +42,17 @@ public class CourseHomeworkVo{
 	@ApiModelProperty("声部名称")
 	private String subjectName;
 
+	@ApiModelProperty("学生id")
+	private Long studentId;
+
 	@ApiModelProperty("学员姓名")
 	private String studentName;
 
 	@ApiModelProperty("学员头像")
 	private String studentAvatar;
 
+	@ApiModelProperty("老师id")
+	private Long teacherId;
 
 	@ApiModelProperty("老师姓名")
 	private String teacherName;
@@ -64,6 +69,21 @@ public class CourseHomeworkVo{
 	@ApiModelProperty("作业提交时间")
 	private Date submitTime;
 
+	public Long getStudentId() {
+		return studentId;
+	}
+
+	public void setStudentId(Long studentId) {
+		this.studentId = studentId;
+	}
+
+	public Long getTeacherId() {
+		return teacherId;
+	}
+
+	public void setTeacherId(Long teacherId) {
+		this.teacherId = teacherId;
+	}
 
 	public Date getDecorateTime() {
 		return decorateTime;

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseHomeworkMapper.xml

@@ -172,6 +172,7 @@
 	<select id="selectPaymentStudentInfo" resultType="com.yonge.cooleshow.biz.dal.vo.CourseHomeworkDetailVo">
         select su.username_ as studentName
         ,su.avatar_ as stduentAvatar
+        ,cssp.user_id_ as studentId
         from course_schedule cs
         left join course_schedule_student_payment cssp on cs.id_ = cssp.course_id_
         left join sys_user su on su.id_ = cssp.user_id_
@@ -187,6 +188,7 @@
         select s.name_ as subjectName
         ,su.username_ as teacherName
         ,su.avatar_ as teacherAvatar
+        ,su.id_ as teacherId
         from course_group cg
         left join subject s on cg.subject_id_ = s.id_
         left join sys_user su on cg.teacher_id_ = su.id_
@@ -199,7 +201,8 @@
 
 	<select id="selectStudentInfo" resultType="com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo">
         select
-        s.name_ as subjectName
+        cssp.user_id_ as studentId
+        ,s.name_ as subjectName
         ,su.username_ as studentName
         ,su.avatar_ as studentAvatar
         from course_schedule_student_payment cssp
@@ -246,7 +249,8 @@
 
 	<select id="selectTeacherInfo" resultType="com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo">
         select
-        su.username_ as teacherName
+        cs.teacher_id_ as teacherId
+        ,su.username_ as teacherName
         ,su.avatar_ as teacherAvatar
         ,if(sa.id_ is null,1,0) as absenteeism
         from course_schedule cs