vip定制课

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

@@ -463,13 +463,17 @@ public class HomeServiceImpl implements HomeService {
         for (String s : dateList) {
             for (String type : typeArr) {
                 List<TeacherIndexWrapper.CourseExposureTotal> dateMap = typeMap.get(type);
-                Map<String, TeacherIndexWrapper.CourseExposureTotal> dateMapGroup = dateMap.stream()
-                        .collect(Collectors.toMap(TeacherIndexWrapper.CourseExposureTotal::getDate, o -> o));
-                TeacherIndexWrapper.CourseExposureTotal courseExposureTotal = dateMapGroup.get(s);
-                if(Objects.nonNull(courseExposureTotal)){
-                    result.add(courseExposureTotal);
-                }else {
+                if(CollectionUtils.isEmpty(dateMap)){
                     result.add(new TeacherIndexWrapper.CourseExposureTotal(s,type,0));
+                }else {
+                    Map<String, TeacherIndexWrapper.CourseExposureTotal> dateMapGroup = dateMap.stream()
+                            .collect(Collectors.toMap(TeacherIndexWrapper.CourseExposureTotal::getDate, o -> o));
+                    TeacherIndexWrapper.CourseExposureTotal courseExposureTotal = dateMapGroup.get(s);
+                    if(Objects.nonNull(courseExposureTotal)){
+                        result.add(courseExposureTotal);
+                    }else {
+                        result.add(new TeacherIndexWrapper.CourseExposureTotal(s,type,0));
+                    }
                 }
             }
         }

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

@@ -156,7 +156,7 @@
         s.name_ as subjectName,
         cs.start_time_ as startTime,
         cs.end_time_ as endTime,
-        cs.status_ as `status`,
+        g.status_ as `status`,
         cs.pre_student_num_ as studentCount,
         cs.background_pic_ as backgroundPic,
         cs.im_group_id_  as imGroupId,
@@ -168,25 +168,25 @@
         cs.course_introduce_ as courseIntroduce
         from (select * from (
         select cg.course_num_,cg.complete_course_num_,cg.course_introduce_,cg.pre_student_num_,
-        cg.background_pic_,cg.im_group_id_,cg.name_,cg.subject_id_,cg.status_ group_status_,cg.teacher_id_,
-        cs.status_,cs.type_,cs.course_group_id_,cs.class_date_,cs.start_time_,cs.end_time_,cs.id_,cs.class_num_
+        cg.background_pic_,cg.im_group_id_,cg.name_,cg.subject_id_,cg.teacher_id_,cg.status_,
+        cs.type_,cs.course_group_id_,cs.class_date_,cs.start_time_,cs.end_time_,cs.id_,cs.class_num_
         from course_schedule cs
         left join course_group cg on cs.course_group_id_ = cg.id_
         where cs.type_ = #{param.type} AND cs.lock_ = 0 AND cg.teacher_id_ = #{param.teacherId}
+        <if test="param.groupState !=null and param.groupState !=''">
+            AND  find_in_set(cg.status_, #{param.groupState})
+        </if>
+        <if test="param.status !=null and param.status !=''">
+            AND cg.status_ = #{param.status}
+        </if>
+        <if test="param.subjectId != null and param.subjectId !=''">
+            AND cg.subject_id_ = #{param.subjectId}
+        </if>
         order by cs.start_time_) cs
         group by cs.course_group_id_) cs
         left join subject as s on cs.subject_id_ = s.id_
         left join sys_user su on su.id_ = cs.teacher_id_
         <where>
-            <if test="param.groupState !=null and param.groupState !=''">
-                AND  find_in_set(cs.group_status_, #{param.groupState})
-            </if>
-            <if test="param.status !=null and param.status !=''">
-                AND cs.status_ = #{param.status}
-            </if>
-            <if test="param.subjectId != null and param.subjectId !=''">
-                AND cs.subject_id_ = #{param.subjectId}
-            </if>
             <if test="param.search != null and param.search !=''">
                 AND (cs.name_ LIKE CONCAT('%', #{param.search}, '%') OR su.username_ LIKE CONCAT('%', #{param.search}, '%'))
             </if>
@@ -560,7 +560,7 @@
         cs.class_date_ AS classDate,
         cs.start_time_ AS startTime,
         cs.end_time_ AS endTime,
-        cs.status_ AS `status`,
+        g.status_ AS `status`,
         cs.type_ AS courseType,
         su.username_ AS realName,
         su.id_ AS userId,
@@ -576,7 +576,7 @@
         g.complete_course_num_ as completeCourseNum
         FROM
         (select * from (
-        select cssp.user_id_,cssp.course_id_,cssp.order_no_,cs.status_,cs.type_,
+        select cssp.user_id_,cssp.course_id_,cssp.order_no_,cs.type_,
                cs.course_group_id_,cs.class_date_,cs.start_time_,cs.end_time_,cs.class_num_
         from course_schedule_student_payment cssp
         LEFT JOIN course_schedule cs on cssp.course_id_ = cs.id_
@@ -595,7 +595,7 @@
                 AND g.subject_id_ = #{param.subjectId}
             </if>
             <if test="param.courseState != null">
-                and cs.status_ = #{param.courseState}
+                and g.status_ = #{param.courseState}
             </if>
             <if test="param.search != null and param.search != ''">
                 and g.name_ like CONCAT('%',#{param.search},'%')