Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/DemoGroupDao.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.EducationDemoGroupListDto;
 import com.ym.mec.biz.dal.dto.StudentDemoGroupListDto;
 import com.ym.mec.biz.dal.dto.TeacherManageDemoGroupListDto;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
@@ -84,5 +85,12 @@ public interface DemoGroupDao extends BaseDAO<Long, DemoGroup> {
      * 统计老师试听课安排
      */
     int countTeacherDemoGroups(Map<String,Object> params);
+
+    /**
+     * @Author: Joburgess
+     * @Date: 2019/9/27
+     * 根据老师获取本周内的试听课安排
+     */
+    List<EducationDemoGroupListDto> findDemoGroupStartClassTimesWithWeekByTeacherId(Long teacherId);
 	
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/EducationDemoGroupListDto.java

@@ -0,0 +1,34 @@
+package com.ym.mec.biz.dal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+/**
+ * @Author Joburgess
+ * @Date 2019/9/27
+ */
+public class EducationDemoGroupListDto {
+
+    @ApiModelProperty(value = "上课日期",required = false)
+    private Date classDate;
+
+    @ApiModelProperty(value = "上课时间",required = false)
+    private String startClassTimes;
+
+    public Date getClassDate() {
+        return classDate;
+    }
+
+    public void setClassDate(Date classDate) {
+        this.classDate = classDate;
+    }
+
+    public String getStartClassTimes() {
+        return startClassTimes;
+    }
+
+    public void setStartClassTimes(String startClassTimes) {
+        this.startClassTimes = startClassTimes;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/service/DemoGroupService.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.dto.DemoGroupApplyDto;
+import com.ym.mec.biz.dal.dto.EducationDemoGroupListDto;
 import com.ym.mec.biz.dal.dto.TeacherManageDemoGroupListDto;
 import com.ym.mec.biz.dal.entity.DemoGroup;
 import com.ym.mec.biz.dal.page.StudentDemoGroupQueryInfo;
@@ -8,6 +9,9 @@ import com.ym.mec.biz.dal.page.TeacherManageDemoGroupQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
+import org.hibernate.validator.constraints.EAN;
+
+import java.util.List;
 
 public interface DemoGroupService extends BaseService<Long, DemoGroup> {
 
@@ -46,4 +50,11 @@ public interface DemoGroupService extends BaseService<Long, DemoGroup> {
      */
     PageInfo findTeacherDemoGroups(TeacherManageDemoGroupQueryInfo queryInfo);
 
+    /**
+     * @Author: Joburgess
+     * @Date: 2019/9/27
+     *
+     */
+    List<EducationDemoGroupListDto> findDemoGroupStartClassTimesWithWeekByTeacherId(Long teacherID);
+
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/DemoGroupServiceImpl.java

@@ -4,6 +4,7 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.DemoGroupApplyDto;
+import com.ym.mec.biz.dal.dto.EducationDemoGroupListDto;
 import com.ym.mec.biz.dal.dto.TeacherManageDemoGroupListDto;
 import com.ym.mec.biz.dal.dto.VipGroupApplyBaseInfoDto;
 import com.ym.mec.biz.dal.entity.*;
@@ -164,4 +165,9 @@ public class DemoGroupServiceImpl extends BaseServiceImpl<Long, DemoGroup>  impl
 		pageInfo.setRows(dataList);
 		return pageInfo;
 	}
+
+	@Override
+	public List<EducationDemoGroupListDto> findDemoGroupStartClassTimesWithWeekByTeacherId(Long teacherID) {
+		return demoGroupDao.findDemoGroupStartClassTimesWithWeekByTeacherId(teacherID);
+	}
 }

mec-biz/src/main/resources/config/mybatis/DemoGroupMapper.xml

@@ -218,4 +218,16 @@ create_time_ = #{createTime},
 		<include refid="teacherDemoGroupsQueryCondition"/>
 		GROUP BY cs.class_date_
 	</select>
+
+	<select id="findDemoGroupStartClassTimesWithWeekByTeacherId" resultType="com.ym.mec.biz.dal.dto.EducationDemoGroupListDto">
+		SELECT
+			class_date_ classDate,
+			GROUP_CONCAT(start_class_time_) startClassTimes
+		FROM
+			course_schedule
+		WHERE
+			YEARWEEK(class_date_) = YEARWEEK( now( ) )
+		GROUP BY class_date_
+	</select>
+
 </mapper>

mec-education/pom.xml

@@ -98,6 +98,11 @@
 			</exclusions>
 		</dependency>
 
+		<!--<dependency>-->
+			<!--<groupId>com.ym</groupId>-->
+			<!--<artifactId>mec-biz</artifactId>-->
+		<!--</dependency>-->
+
 	</dependencies>
 	<build>
 		<plugins>

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

@@ -0,0 +1,27 @@
+package com.ym.mec.education.controller;
+
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author Joburgess
+ * @Date 2019/9/27
+ */
+
+@Api(tags = "试听课-教务端")
+@RequestMapping("educationDemoGroup")
+@RestController
+public class EducationDemoGroupController extends BaseController {
+
+//    @Autowired
+//    private DemoGroupService demoGroupService;
+//
+//    @ApiOperation(value = "试听课安排")
+//    @PostMapping("/queryStudentDemoGroups")
+//    public Object queryTeacherDemoGroups(Long teacherId){
+//        return succeed(demoGroupService.findDemoGroupStartClassTimesWithWeekByTeacherId(teacherId));
+//    }
+
+}

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

@@ -1,7 +1,7 @@
 package com.ym.mec.education.controller;
 
 import com.ym.mec.education.base.PageResponse;
-import com.ym.mec.education.req.StudentAttendanceReq;
+import com.ym.mec.education.req.ClassGroupReq;
 import com.ym.mec.education.service.IStudentAttendanceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -29,8 +29,8 @@ public class StudentAttendanceController {
 
     @PostMapping("/list")
     @ApiOperation("点名记录列表")
-    public PageResponse list(@RequestBody StudentAttendanceReq studentAttendanceReq) {
-        return studentAttendanceService.getPage(studentAttendanceReq);
+    public PageResponse list(@RequestBody ClassGroupReq classGroupReq) {
+        return studentAttendanceService.getPage(classGroupReq);
     }
 
 }

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.sql.Time;
 import java.util.Date;
 
 /**
@@ -48,12 +49,12 @@ public class CourseSchedule extends Model<CourseSchedule> {
      * 上课时间
      */
     @TableField("start_class_time_")
-    private Date startClassTime;
+    private Time startClassTime;
     /**
      * 结束时间
      */
     @TableField("end_class_time_")
-    private Date endClassTime;
+    private Time endClassTime;
     /**
      * 上课教师
      */
@@ -125,20 +126,20 @@ public class CourseSchedule extends Model<CourseSchedule> {
         return this;
     }
 
-    public Date getStartClassTime() {
+    public Time getStartClassTime() {
         return startClassTime;
     }
 
-    public CourseSchedule setStartClassTime(Date startClassTime) {
+    public CourseSchedule setStartClassTime(Time startClassTime) {
         this.startClassTime = startClassTime;
         return this;
     }
 
-    public Date getEndClassTime() {
+    public Time getEndClassTime() {
         return endClassTime;
     }
 
-    public CourseSchedule setEndClassTime(Date endClassTime) {
+    public CourseSchedule setEndClassTime(Time endClassTime) {
         this.endClassTime = endClassTime;
         return this;
     }

mec-education/src/main/java/com/ym/mec/education/mapper/SubjectMapper.java

@@ -1,7 +1,7 @@
 package com.ym.mec.education.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ym.mec.education.entity.Subject;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
 
 /**
  * <p>

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

@@ -1,22 +0,0 @@
-package com.ym.mec.education.req;
-
-import com.ym.mec.education.base.BaseQuery;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @program: mec
- * @description: 考勤记录请求参数
- * @author: xw
- * @create: 2019-09-25 21:53
- */
-@Data
-@ApiModel(description = "考勤入参")
-public class StudentAttendanceReq extends BaseQuery {
-
-    @ApiModelProperty(value = "乐团id",required = true)
-    private Integer musicGroupId;
-    @ApiModelProperty(value = "班级id",required = true)
-    private Integer classGroupId;
-}

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

@@ -30,4 +30,9 @@ public class ClassTeacherResp implements Serializable {
 
     private List<String> className;
 
+    /**
+     * 老师技能
+     */
+    private List<String> techSubject;
+
 }

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

@@ -1,10 +1,10 @@
 package com.ym.mec.education.resp;
 
-import com.ym.mec.education.base.BaseQuery;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
+import java.io.Serializable;
 
 /**
  * @program: mec
@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
 @Data
 @ApiModel(description = "学员名单出参")
 @Accessors(chain = true)
-public class StudentListResp extends BaseQuery {
+public class StudentListResp implements Serializable {
 
     @ApiModelProperty(value = "学员名称",required = true)
     private String studentName;

mec-education/src/main/java/com/ym/mec/education/service/IStudentAttendanceService.java

@@ -3,7 +3,7 @@ package com.ym.mec.education.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ym.mec.education.base.PageResponse;
 import com.ym.mec.education.entity.StudentAttendance;
-import com.ym.mec.education.req.StudentAttendanceReq;
+import com.ym.mec.education.req.ClassGroupReq;
 
 /**
  * <p>
@@ -15,6 +15,6 @@ import com.ym.mec.education.req.StudentAttendanceReq;
  */
 public interface IStudentAttendanceService extends IService<StudentAttendance> {
 
-    PageResponse getPage(StudentAttendanceReq studentAttendanceReq);
+    PageResponse getPage(ClassGroupReq classGroupReq);
 
 }

mec-education/src/main/java/com/ym/mec/education/service/ISubjectService.java

@@ -1,7 +1,7 @@
 package com.ym.mec.education.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ym.mec.education.entity.Subject;
-import com.baomidou.mybatisplus.service.IService;
 
 /**
  * <p>

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

@@ -56,8 +56,8 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleMapper,
         courseScheduleIPage.getRecords().forEach(item ->{
             CourseScheduleResp courseScheduleResp = new CourseScheduleResp();
             courseScheduleResp.setClassDate(DateUtil.date2String(item.getClassDate())
-                    + "" + DateUtil.date2Week(item.getClassDate()))
-                    .setClassTime(item.getStartClassTime() + "-" + item.getEndClassTime())
+                    + " " + DateUtil.date2Week(item.getClassDate()))
+                    .setClassTime(DateUtil.time2String(item.getStartClassTime()) + "-" + DateUtil.time2String(item.getEndClassTime()))
                     .setClassGroupName(classGroup.getName());
             QueryWrapper<ClassGroupTeacherMapper> classGroupTeacherMapperQueryWrapper = new QueryWrapper<>();
             classGroupTeacherMapperQueryWrapper.lambda().eq(true, ClassGroupTeacherMapper::getClassGroupId, item.getClassGroupId())

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

@@ -1,5 +1,4 @@
 package com.ym.mec.education.service.impl;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -58,6 +57,9 @@ public class MusicGroupServiceImpl extends ServiceImpl<MusicGroupMapper, MusicGr
     @Autowired
     private IStudentAttendanceService studentAttendanceService;
 
+    @Autowired
+    private ISubjectService subjectService;
+
 
     @Override
     public PageResponse groupList(MusicGroupReq req) {
@@ -316,9 +318,9 @@ public class MusicGroupServiceImpl extends ServiceImpl<MusicGroupMapper, MusicGr
                 List<ClassGroupTeacherMapper> list = classGroupTeacherMapperService.list(queryWrapper2);
                 if(!CollectionUtils.isEmpty(list)){
 
-                    list.forEach(stud ->{
+                    list.forEach(tech ->{
                         ClassTeacherResp classTeacherResp = new ClassTeacherResp();
-                        List<ClassTeacherResp> removeList = classTeacherResps.stream().filter(c ->c.getUserId().equals(stud.getUserId()) && c.getClassGroupId().equals(stud.getClassGroupId())).collect(Collectors.toList());
+                        List<ClassTeacherResp> removeList = classTeacherResps.stream().filter(c ->c.getUserId().equals(tech.getUserId()) && c.getClassGroupId().equals(tech.getClassGroupId())).collect(Collectors.toList());
                         HashSet set = new HashSet<>();
                         if(!CollectionUtils.isEmpty(removeList)){
 
@@ -327,16 +329,31 @@ public class MusicGroupServiceImpl extends ServiceImpl<MusicGroupMapper, MusicGr
                             set.add(e.getName());
                             classTeacherResp.setClassName(new ArrayList<>(set));
                         }else{
-                            SysUser sysUser = sysUserService.getById(stud.getUserId());
+                            SysUser sysUser = sysUserService.getById(tech.getUserId());
                             if(sysUser != null){
                                 classTeacherResp.setName(sysUser.getRealName());
                                 classTeacherResp.setAvatar(sysUser.getAvatar());
                             }
-                            classTeacherResp.setUserId(stud.getUserId());
-                            classTeacherResp.setClassGroupId(stud.getClassGroupId());
+                            classTeacherResp.setUserId(tech.getUserId());
+                            classTeacherResp.setClassGroupId(tech.getClassGroupId());
 
                             set.add(e.getName());
                             classTeacherResp.setClassName(new ArrayList<>(set));
+
+                            //查询老师技能
+                            Teacher  teacher =  teacherService.getById(tech.getUserId());
+                            if(teacher != null && !StringUtils.isEmpty(teacher.getSubjectId())){
+                                String ids[] = teacher.getSubjectId().split(",");
+                                List<String> stringB = Arrays.asList(ids);
+                                QueryWrapper<Subject> queryWrapper = new QueryWrapper<>();
+                                queryWrapper.in("id_",stringB);
+                                List<Subject> subjectList =  subjectService.list(queryWrapper);
+                                if(!CollectionUtils.isEmpty(subjectList)){
+                                    List<String> subName = subjectList.stream().map(Subject::getName).collect(Collectors.toList());
+                                    classTeacherResp.setTechSubject(subName);
+                                }
+                            }
+
                             classTeacherResps.add(classTeacherResp);
                         }
 

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

@@ -11,7 +11,7 @@ import com.ym.mec.education.entity.CourseSchedule;
 import com.ym.mec.education.entity.StudentAttendance;
 import com.ym.mec.education.enums.StudentAttendanceStatusEnum;
 import com.ym.mec.education.mapper.StudentAttendanceMapper;
-import com.ym.mec.education.req.StudentAttendanceReq;
+import com.ym.mec.education.req.ClassGroupReq;
 import com.ym.mec.education.resp.StudentAttendanceResq;
 import com.ym.mec.education.service.IClassGroupService;
 import com.ym.mec.education.service.ICourseScheduleService;
@@ -20,6 +20,7 @@ import com.ym.mec.education.utils.DateUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.List;
 import java.util.Objects;
 
@@ -40,13 +41,11 @@ public class StudentAttendanceServiceImpl extends ServiceImpl<StudentAttendanceM
     private IClassGroupService groupService;
 
     @Override
-    public PageResponse getPage(StudentAttendanceReq studentAttendanceReq) {
-        Page<StudentAttendance> pageParam = new Page(studentAttendanceReq.getPageNo(), studentAttendanceReq.getPageSize());
+    public PageResponse getPage(ClassGroupReq classGroupReq) {
+        Page<StudentAttendance> pageParam = new Page(classGroupReq.getPageNo(), classGroupReq.getPageSize());
         QueryWrapper<StudentAttendance> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(Objects.nonNull(studentAttendanceReq.getMusicGroupId()),
-                StudentAttendance::getMusicGroupId, studentAttendanceReq.getMusicGroupId())
-                .eq(Objects.nonNull(studentAttendanceReq.getClassGroupId()),
-                        StudentAttendance::getClassGroupId, studentAttendanceReq.getClassGroupId());
+        queryWrapper.lambda().eq(Objects.nonNull(classGroupReq.getGroupId()),
+                StudentAttendance::getClassGroupId, classGroupReq.getGroupId());
         IPage<StudentAttendance> page = page(pageParam, queryWrapper);
         IPage<StudentAttendanceResq> pageResult = new Page<>();
         BeanUtils.copyProperties(page, pageResult);
@@ -56,27 +55,30 @@ public class StudentAttendanceServiceImpl extends ServiceImpl<StudentAttendanceM
         //总人数
         Integer totalCount = count();
         //请假
-        leaveWrapper.lambda().eq(true, StudentAttendance::getMusicGroupId, studentAttendanceReq.getMusicGroupId())
-                .eq(true, StudentAttendance::getClassGroupId, studentAttendanceReq.getClassGroupId())
+        leaveWrapper.lambda().eq(true, StudentAttendance::getClassGroupId, classGroupReq.getGroupId())
                 .eq(true, StudentAttendance::getStatus, StudentAttendanceStatusEnum.LEAVE.getCode());
         Integer leaveCount = count(leaveWrapper);
         //正常
-        normalWrapper.lambda().eq(true, StudentAttendance::getMusicGroupId, studentAttendanceReq.getMusicGroupId())
-                .eq(true, StudentAttendance::getClassGroupId, studentAttendanceReq.getClassGroupId())
+        normalWrapper.lambda().eq(true, StudentAttendance::getClassGroupId, classGroupReq.getGroupId())
                 .eq(true, StudentAttendance::getStatus, StudentAttendanceStatusEnum.NORMAL.getCode());
         Integer normalCount = count(normalWrapper);
-        page.getRecords().forEach(item ->{
+        page.getRecords().forEach(item -> {
             StudentAttendanceResq studentAttendanceResq = new StudentAttendanceResq();
+            studentAttendanceResq.setLeaveNum(leaveCount).setAttendanceRate(normalCount + "/" + totalCount);
             QueryWrapper<CourseSchedule> courseScheduleQueryWrapper = new QueryWrapper<>();
-            courseScheduleQueryWrapper.lambda().eq(true, CourseSchedule::getClassGroupId, studentAttendanceReq.getClassGroupId());
+            courseScheduleQueryWrapper.lambda().eq(true, CourseSchedule::getClassGroupId, classGroupReq.getGroupId())
+                    .eq(true, CourseSchedule::getTeacherId, item.getTeacherId());
             CourseSchedule courseSchedule = courseScheduleService.getOne(courseScheduleQueryWrapper);
-            ClassGroup classGroup = groupService.getById(studentAttendanceReq.getClassGroupId());
-            studentAttendanceResq.setClassDate(DateUtil.date2String(courseSchedule.getClassDate())
-                    + "" + DateUtil.date2Week(courseSchedule.getClassDate()))
-                    .setClassTime(courseSchedule.getStartClassTime() + "-" + courseSchedule.getEndClassTime())
-                    .setClassGroupName(classGroup.getName())
-                    .setLeaveNum(leaveCount).setAttendanceRate(normalCount + "/" + totalCount);
-            list.add(studentAttendanceResq);
+            if (Objects.nonNull(courseSchedule)) {
+                studentAttendanceResq.setClassDate(DateUtil.date2String(courseSchedule.getClassDate())
+                        + " " + DateUtil.date2Week(courseSchedule.getClassDate()))
+                        .setClassTime(courseSchedule.getStartClassTime() + "-" + courseSchedule.getEndClassTime());
+            }
+            ClassGroup classGroup = groupService.getById(classGroupReq.getGroupId());
+            if (Objects.nonNull(classGroup)) {
+                studentAttendanceResq.setClassGroupName(classGroup.getName());
+                list.add(studentAttendanceResq);
+            }
         });
         pageResult.setRecords(list);
         return PageResponse.success(pageResult);

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

@@ -1,9 +1,9 @@
 package com.ym.mec.education.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ym.mec.education.entity.Subject;
 import com.ym.mec.education.mapper.SubjectMapper;
 import com.ym.mec.education.service.ISubjectService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

mec-education/src/main/java/com/ym/mec/education/utils/DateUtil.java

@@ -1,8 +1,10 @@
 package com.ym.mec.education.utils;
 
 import java.math.BigDecimal;
+import java.sql.Time;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -15,6 +17,7 @@ import java.util.Date;
 public class DateUtil {
 
     private static final String DATE_FORMAT = "MM月dd日";
+    private static final String TIME_FORMAT = "HH:mm";
     private static ThreadLocal<DateFormat> threadLocal = new ThreadLocal<DateFormat>();
 
     public static DateFormat getDateFormat(String dateFormat) {
@@ -35,6 +38,11 @@ public class DateUtil {
         return format;
     }
 
+    public static String time2String(Time time) {
+        String format = time.toLocalTime().format(DateTimeFormatter.ofPattern(TIME_FORMAT));
+        return format;
+    }
+
     public static String date2Week(Date date) {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(date);

mec-student/src/main/java/com/ym/mec/student/controller/StudentCourseScheduleController.java

@@ -6,10 +6,13 @@ import com.ym.mec.biz.service.StudentAttendanceService;
 import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
+
 /**
  * @Author Joburgess
  * @Date 2019/9/24
@@ -24,6 +27,19 @@ public class StudentCourseScheduleController extends BaseController {
     @Autowired
     private StudentAttendanceService studentAttendanceService;
 
+    @ApiOperation(value = "根据月份获取乐团在该月有课的日期")
+    @GetMapping("/getCourseScheduleDateByMonth")
+    public Object getCourseScheduleDateByMonth(@ApiParam(value = "乐团编号", required = true) @RequestParam Long musicGroupID,
+                                               @ApiParam(value = "月份", required = true) @RequestParam Date month) {
+        return succeed(scheduleService.getCourseScheduleDateByMonth(musicGroupID,month));
+    }
+
+    @ApiOperation(value = "根据日期获取当日排课")
+    @GetMapping("/getCourseSchedulesWithDate")
+    public Object getCourseSchedulesWithDate(@ApiParam(value = "日期", required = true) Date date){
+        return succeed(scheduleService.getCourseSchedulesWithDate(date));
+    }
+
     @ApiOperation(value = "课时调整")
     @PostMapping(value = "/classStartDateAdjust",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Object classStartDateAdjust(ClassDateAdjustDto classDateAdjustDto){