Merge branch 'zx_online_update_1218' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/CourseHomeworkController.java

@@ -3,12 +3,11 @@ package com.yonge.cooleshow.student.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.dto.CourseHomeworkSubmitDto;
 import com.yonge.cooleshow.biz.dal.dto.search.HomeworkSearch;
+import com.yonge.cooleshow.biz.dal.entity.StudentAttendance;
+import com.yonge.cooleshow.biz.dal.entity.TeacherAttendance;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
-import com.yonge.cooleshow.biz.dal.service.CourseHomeworkService;
-import com.yonge.cooleshow.biz.dal.service.CourseScheduleService;
-import com.yonge.cooleshow.biz.dal.service.ImGroupService;
-import com.yonge.cooleshow.biz.dal.service.SysUserService;
+import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -26,6 +25,7 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Description 学生课后作业相关接口
@@ -49,6 +49,8 @@ public class CourseHomeworkController extends BaseController {
 
     @Resource
     private ImGroupService imGroupService;
+    @Resource
+    private StudentAttendanceService studentAttendanceService;
 
 
     @ApiOperation(value = "首页-我的课程-课程详情(趣纠课)-课后作业信息详情",notes = "传入课程编号ID")
@@ -62,6 +64,10 @@ public class CourseHomeworkController extends BaseController {
         CourseHomeworkDetailVo detailVo = courseHomeworkService.getCourseHomeworkDetailByCourseId(courseId, userId);
         if (detailVo != null) {
             detailVo.setImUserId(imGroupService.getImUserId(String.valueOf(detailVo.getTeacherId()),ClientEnum.TEACHER.name()));
+            //获取学生考勤信息
+            StudentAttendance one = studentAttendanceService.lambdaQuery().eq(StudentAttendance::getCourseScheduleId, courseId)
+                    .eq(StudentAttendance::getStudentId, userId).last("limit 1").one();
+            detailVo.setAttendanceStatus(Objects.nonNull(one));
         }
         return succeed(detailVo);
     }

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/CourseHomeworkController.java

@@ -5,12 +5,10 @@ import com.yonge.cooleshow.biz.dal.dto.CourseHomeworkReviewDto;
 import com.yonge.cooleshow.biz.dal.dto.CourseHomeworkSaveDto;
 import com.yonge.cooleshow.biz.dal.dto.CourseScheduleHomeworkSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.HomeworkSearch;
+import com.yonge.cooleshow.biz.dal.entity.TeacherAttendance;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
-import com.yonge.cooleshow.biz.dal.service.CourseHomeworkService;
-import com.yonge.cooleshow.biz.dal.service.CourseScheduleService;
-import com.yonge.cooleshow.biz.dal.service.ImGroupService;
-import com.yonge.cooleshow.biz.dal.service.SysUserService;
+import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.vo.CountVo;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo;
@@ -30,6 +28,7 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Description 老师课后作业相关接口
@@ -44,15 +43,14 @@ public class CourseHomeworkController extends BaseController {
 
     @Resource
     private SysUserService sysUserService;
-
     @Resource
     private CourseScheduleService courseScheduleService;
-
     @Resource
     private CourseHomeworkService courseHomeworkService;
-
     @Resource
     private ImGroupService imGroupService;
+    @Resource
+    private TeacherAttendanceService teacherAttendanceService;
 
     @ApiOperation(value = "未布置的课后作业数量")
     @GetMapping(value="/count")
@@ -77,12 +75,16 @@ public class CourseHomeworkController extends BaseController {
     public HttpResponseResult<CourseHomeworkDetailVo> detail(@ApiParam(value = "课程编号ID", required = true)
                                                                  @PathVariable("courseId") Long courseId,
                                                              @PathVariable("studentId") Long studentId) {
-
-        HttpResponseResult info = checkCourseSchedule(courseId,sysUserService.getUserId());
+        Long userId = sysUserService.getUserId();
+        HttpResponseResult info = checkCourseSchedule(courseId,userId);
         if (info != null) return info;
         CourseHomeworkDetailVo detailVo = courseHomeworkService.getCourseHomeworkDetailByCourseId(courseId, studentId);
         if (detailVo != null) {
             detailVo.setImUserId(imGroupService.getImUserId(String.valueOf(detailVo.getStudentId()),ClientEnum.STUDENT.name()));
+            //获取老师考勤信息
+            TeacherAttendance one = teacherAttendanceService.lambdaQuery().eq(TeacherAttendance::getCourseScheduleId, courseId)
+                    .eq(TeacherAttendance::getTeacherId, userId).last("limit 1").one();
+            detailVo.setAttendanceStatus(Objects.nonNull(one));
         }
 
         return succeed(detailVo);

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

@@ -464,6 +464,7 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
                 e.setSubjectName(subjectMap.get(e.getSubjectId()));
                 com.yonge.cooleshow.biz.dal.entity.SysUser user = userMap.get(e.getTeacherId());
                 if(Objects.nonNull(user)){
+                    e.setCourseGroupName(e.getCourseGroupName() + "-" + user.getUsername());
                     e.setTeacherName(user.getUsername());
                     e.setTeacherAvatar(user.getAvatar());
                 }

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

@@ -124,6 +124,18 @@ public class CourseHomeworkDetailVo {
     @ApiModelProperty(value = "IM聊天用户ID")
     private String imUserId;
 
+    @ApiModelProperty(value = "考勤状态 , false:未考勤 true:已考勤")
+    private Boolean attendanceStatus;
+
+
+    public Boolean getAttendanceStatus() {
+        return attendanceStatus;
+    }
+
+    public void setAttendanceStatus(Boolean attendanceStatus) {
+        this.attendanceStatus = attendanceStatus;
+    }
+
     public String getCourseGroupName() {
         return courseGroupName;
     }