Merge remote-tracking branch 'origin/master'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ImGroup.java

@@ -66,6 +66,18 @@ public class ImGroup implements Serializable {
     @ApiModelProperty(value = "修改时间;")
     private Date updateTime;
 
+    @TableField("course_group_id_")
+    @ApiModelProperty(value = "课程组id")
+    private Long courseGroupId;
+
+    public Long getCourseGroupId() {
+        return courseGroupId;
+    }
+
+    public void setCourseGroupId(Long courseGroupId) {
+        this.courseGroupId = courseGroupId;
+    }
+
     public Boolean getAutoPassFlag() {
         return autoPassFlag;
     }

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

@@ -1142,10 +1142,10 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         }
 
         //课程改为过去式避免校验时报错
-        baseMapper.update(null,Wrappers.<CourseSchedule>lambdaUpdate()
-                .eq(CourseSchedule::getId,adjustVo.getCourseId())
-                .set(CourseSchedule::getStartTime,DateUtil.getYesterday())
-                .set(CourseSchedule::getEndTime,DateUtil.getYesterday()));
+        baseMapper.update(null, Wrappers.<CourseSchedule>lambdaUpdate()
+                .eq(CourseSchedule::getId, adjustVo.getCourseId())
+                .set(CourseSchedule::getStartTime, DateUtil.getYesterday())
+                .set(CourseSchedule::getEndTime, DateUtil.getYesterday()));
 
         CourseTimeEntity timeEntity = new CourseTimeEntity();
         timeEntity.setStartTime(startTime);
@@ -1494,7 +1494,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
      * @return
      */
     public List<DateChangeVo> splicingDate(String day, List<DateVo> strDateList, List<DateChangeVo> rList) {
-        if (CollectionUtils.isNotEmpty(strDateList)){
+        if (CollectionUtils.isNotEmpty(strDateList)) {
             for (DateVo vo : strDateList) {
                 if (vo != null) {
                     DateChangeVo dateChange = new DateChangeVo();

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

@@ -101,6 +101,7 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
         imGroup.setUpdateTime(now);
         String imGroupId = UUID.randomUUID() + imGroup.getType().getCode();
         imGroup.setId(imGroupId);
+        imGroup.setCourseGroupId(courseGroupId);
         this.baseMapper.insert(imGroup);
         //保存老师学员关联的通讯录
         imUserFriendService.saveUserFriend(teacherId, studentIds);

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

@@ -42,6 +42,17 @@ public class CourseScheduleRecordVo implements Serializable {
     @ApiModelProperty(value = "单课时长")
     private Integer singleCourseTime;
 
+    @ApiModelProperty(value = "通讯组id")
+    private String imGroupId;
+
+    public String getImGroupId() {
+        return imGroupId;
+    }
+
+    public void setImGroupId(String imGroupId) {
+        this.imGroupId = imGroupId;
+    }
+
     public Integer getSingleCourseTime() {
         return singleCourseTime;
     }

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

@@ -79,11 +79,13 @@
         s.start_time_ AS startTime,
         s.end_time_ AS endTime,
         s.single_course_time_ AS singleCourseTime,
-        a.count_ AS studentCount
+        a.count_ AS studentCount,
+        i.id_ AS imGroupId
         FROM course_schedule s
         LEFT JOIN course_group g ON s.course_group_id_ = g.id_
         LEFT JOIN `subject` sb ON g.subject_id_ = sb.id_
         LEFT JOIN (SELECT course_id_,COUNT(1) AS count_ FROM course_schedule_student_payment WHERE course_type_='PIANO_ROOM_CLASS' GROUP BY course_id_) a ON s.id_=a.course_id_
+        LEFT JOIN im_group i ON g.id_=i.course_group_id_
         <where>
             <if test="param.type != null and param.type !=''">
                 AND s.type_ = #{param.type}