老师列表

mec-education/src/main/java/com/ym/mec/education/controller/VipGroupController.java

@@ -32,7 +32,7 @@ public class VipGroupController {
         return BaseResponse.success(vipGroupService.getInfo(vipGroupReq));
     }
     @PostMapping("/courseList")
-    @ApiOperation("小课详情-班級")
+    @ApiOperation("小课详情-课表")
     public PageResponse courseList(@RequestBody VipGroupReq vipGroupReq){
 
         return vipGroupService.courseList(vipGroupReq);
@@ -40,7 +40,7 @@ public class VipGroupController {
     }
 
     @PostMapping("/attendanceList")
-    @ApiOperation("小课详情-點名")
+    @ApiOperation("小课详情-点名记录")
     public PageResponse attendanceList(@RequestBody VipGroupReq vipGroupReq){
 
         return vipGroupService.attendanceList(vipGroupReq);

mec-education/src/main/java/com/ym/mec/education/entity/DemoGroupCoursesPlan.java

@@ -1,11 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
 import java.io.Serializable;
 
 /**

mec-education/src/main/java/com/ym/mec/education/entity/StudentCourseHomework.java

@@ -58,6 +58,10 @@ public class StudentCourseHomework extends Model<StudentCourseHomework> {
     private String isReplied;
 
 
+    /**  */
+    @TableField("course_schedule_id_")
+    private Long courseScheduleId;
+
     public Long getId() {
         return id;
     }
@@ -148,6 +152,14 @@ public class StudentCourseHomework extends Model<StudentCourseHomework> {
         return this;
     }
 
+    public Long getCourseScheduleId() {
+        return courseScheduleId;
+    }
+
+    public void setCourseScheduleId(Long courseScheduleId) {
+        this.courseScheduleId = courseScheduleId;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;

mec-education/src/main/java/com/ym/mec/education/req/HomeWorkReq.java

@@ -16,4 +16,6 @@ public class HomeWorkReq extends BaseQuery {
     private String  classGroupId;
 
     private String musicGroupId;
+
+    private Long courseScheduleId;
 }

mec-education/src/main/java/com/ym/mec/education/resp/CourseScheduleResp.java

@@ -49,4 +49,6 @@ public class CourseScheduleResp implements Serializable {
 
     @ApiModelProperty(value = "退团人数")
     private Integer leagueNum;
+    @ApiModelProperty(value = "课程id")
+    private Long id;
 }

mec-education/src/main/java/com/ym/mec/education/resp/VipGroupClassResp.java

@@ -25,4 +25,6 @@ public class VipGroupClassResp implements Serializable {
     private String longTime;
 
     private List<String> studentList;
+
+    private Long id;
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/CourseScheduleServiceImpl.java

@@ -67,6 +67,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleMapper,
         ClassGroup classGroup = groupService.getById(classGroupReq.getGroupId());
         courseScheduleIPage.getRecords().forEach(item -> {
             CourseScheduleResp courseScheduleResp = new CourseScheduleResp();
+            courseScheduleResp.setId(item.getId());
             if (Objects.nonNull(item.getClassDate())) {
                 courseScheduleResp.setClassDate(DateUtil.date2String(item.getClassDate())
                         + " " + DateUtil.date2Week(item.getClassDate()));

mec-education/src/main/java/com/ym/mec/education/service/impl/StudentCourseHomeworkServiceImpl.java

@@ -67,9 +67,10 @@ public class StudentCourseHomeworkServiceImpl extends ServiceImpl<StudentCourseH
         }
         IPage ipage = new Page(req.getPageNo() == null ? 1: req.getPageNo(),req.getPageSize() == null ? 10:req.getPageSize());
         QueryWrapper<StudentCourseHomework> queryWrapper = new QueryWrapper<>();
-        if(userIds != null && !userIds.isEmpty()){
+      /*  if(userIds != null && !userIds.isEmpty()){
             queryWrapper.in("user_id_",userIds);
-        }
+        }*/
+        queryWrapper.eq("course_schedule_id_",req.getCourseScheduleId());
         IPage<StudentCourseHomework> homeworkIPage =  this.page(ipage,queryWrapper);
 
         List<StudentCourseHomework> courseHomeworkList = homeworkIPage.getRecords();

mec-education/src/main/java/com/ym/mec/education/service/impl/TeacherServiceImpl.java

@@ -197,6 +197,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
                                         planList.add(demoGroupPlan);
                                     });
                                     demoGroup.setDemoGroupPlans(planList);
+                                    innerDemoGroups.add(demoGroup);
                                 }
                             }
 
@@ -258,6 +259,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
             vipGroupList.forEach(e ->{
                 VipGroupClassResp vipGroupClassResp = new VipGroupClassResp();
                 vipGroupClassResp.setVipGroupName(e.getName());
+
                 VipGroupCategory vipGroupCategory =  vipGroupCategoryService.getById(e.getVipGroupCategoryId());
                 if(vipGroupCategory != null){
                     vipGroupClassResp.setVipClassType(vipGroupCategory.getName());

mec-education/src/main/resources/mapper/StudentCourseHomeworkMapper.xml

@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.ym.mec.education.entity.StudentCourseHomework">
         <id column="id_" property="id" />
         <result column="course_homework_id_" property="courseHomeworkId" />
+        <result column="course_schedule_id_" property="courseScheduleId" />
         <result column="attachments_" property="attachments" />
         <result column="score_" property="score" />
         <result column="create_time_" property="createTime" />
@@ -18,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id_, course_homework_id_, attachments_, score_, create_time_, update_time_, user_id_, remark_, status_, is_replied_
+        id_, course_homework_id_,course_schedule_id_, attachments_, score_, create_time_, update_time_, user_id_, remark_, status_, is_replied_
     </sql>
 
 </mapper>