Browse Source

陪练课返回IM用户ID

Eric 2 years ago
parent
commit
421243fa5c

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

@@ -104,6 +104,12 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
         if (CollectionUtils.isEmpty(studentInfoList)) {
         if (CollectionUtils.isEmpty(studentInfoList)) {
             studentInfoList = new ArrayList<>();
             studentInfoList = new ArrayList<>();
         }
         }
+
+        for (CourseHomeworkVo item : studentInfoList) {
+
+            item.setImUserId(MessageFormat.format("{0}:{1}", String.valueOf(item.getStudentId()), ClientEnum.STUDENT.name()));
+        }
+
         Map<Long, List<CourseHomeworkVo>> studentCollect = studentInfoList.stream()
         Map<Long, List<CourseHomeworkVo>> studentCollect = studentInfoList.stream()
                 .collect(Collectors.groupingBy( CourseHomeworkVo::getCourseId));
                 .collect(Collectors.groupingBy( CourseHomeworkVo::getCourseId));
 
 
@@ -112,6 +118,12 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
         if (CollectionUtils.isEmpty(teacherInfoList)) {
         if (CollectionUtils.isEmpty(teacherInfoList)) {
             teacherInfoList = new ArrayList<>();
             teacherInfoList = new ArrayList<>();
         }
         }
+
+        for (CourseHomeworkVo item : teacherInfoList) {
+
+            item.setImUserId(String.valueOf(item.getTeacherId()));
+        }
+
         Map<Long, List<CourseHomeworkVo>> teacherCollect = teacherInfoList.stream()
         Map<Long, List<CourseHomeworkVo>> teacherCollect = teacherInfoList.stream()
                       .collect(Collectors.groupingBy( CourseHomeworkVo::getCourseId));
                       .collect(Collectors.groupingBy( CourseHomeworkVo::getCourseId));
 
 

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

@@ -707,6 +707,12 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         if (replied != null) {
         if (replied != null) {
             search.setStatus(CourseScheduleEnum.COMPLETE.getCode());
             search.setStatus(CourseScheduleEnum.COMPLETE.getCode());
             List<MyCourseVo> list = baseMapper.queryTeacherPracticeCourse(page, monthToDate(search));
             List<MyCourseVo> list = baseMapper.queryTeacherPracticeCourse(page, monthToDate(search));
+
+            for (MyCourseVo item : list) {
+
+                item.setImUserId(MessageFormat.format("{0}:{1}", String.valueOf(item.getUserId()), ClientEnum.STUDENT.name()));
+            }
+
             if (replied == 0) {//未评价
             if (replied == 0) {//未评价
                 return page.setRecords(list.stream().filter(s -> {
                 return page.setRecords(list.stream().filter(s -> {
                     return s.getTeacherReplied() == 0;
                     return s.getTeacherReplied() == 0;
@@ -720,7 +726,13 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
             }
             }
         }
         }
 
 
-        return page.setRecords(baseMapper.queryTeacherPracticeCourse(page, monthToDate(search)));
+        List<MyCourseVo> records = baseMapper.queryTeacherPracticeCourse(page, monthToDate(search));
+        for (MyCourseVo item : records) {
+
+            item.setImUserId(MessageFormat.format("{0}:{1}", String.valueOf(item.getUserId()), ClientEnum.STUDENT.name()));
+        }
+
+        return page.setRecords(records);
     }
     }
 
 
     @Override
     @Override

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

@@ -92,6 +92,9 @@ public class CourseHomeworkVo{
 	@ApiModelProperty("作业提交时间")
 	@ApiModelProperty("作业提交时间")
 	private Date submitTime;
 	private Date submitTime;
 
 
+	@ApiModelProperty("IM用户ID")
+	private String imUserId;
+
 	public String getImGroupId() {
 	public String getImGroupId() {
 		return imGroupId;
 		return imGroupId;
 	}
 	}
@@ -267,4 +270,12 @@ public class CourseHomeworkVo{
 	public void setBackgroundPic(String backgroundPic) {
 	public void setBackgroundPic(String backgroundPic) {
 		this.backgroundPic = backgroundPic;
 		this.backgroundPic = backgroundPic;
 	}
 	}
+
+	public String getImUserId() {
+		return imUserId;
+	}
+
+	public void setImUserId(String imUserId) {
+		this.imUserId = imUserId;
+	}
 }
 }