Merge remote-tracking branch 'origin/master'

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

@@ -213,7 +213,7 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
     int countCourseSchedulesWithDate(Map<String, Object> params);
 
     /**
-     * @param musicGroupID: 乐团编号
+     * @param musicGroupId: 乐团编号
      * @return int
      * @describe 根据乐团ID删除排课
      * @author Joburgess
@@ -284,7 +284,9 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @author Joburgess
      * @date 2019/10/18
      */
-    List<Date> getCourseScheduleDate(@Param("month") Date month, @Param("organIdList") String organIdList);
+    List<Date> getCourseScheduleDate(@Param("month") Date month,
+                                     @Param("organIdList") String organIdList,
+                                     @Param("type") String type);
 
     /**
      * @Author: Joburgess

mec-biz/src/main/java/com/ym/mec/biz/dal/page/CourseScheduleQueryInfo.java

@@ -26,6 +26,17 @@ public class CourseScheduleQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "是否只查询历史数据")
     private Integer onlyHistory;
 
+    @ApiModelProperty(value = "课程类型")
+    private String type;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     public Integer getOnlyHistory() {
         return onlyHistory;
     }

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

@@ -167,7 +167,7 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	 * @return java.util.List<java.util.Date>
 	 * @describe 获取
 	 */
-	List<Date> getCourseScheduleDates(Date month, String organIdList);
+	List<Date> getCourseScheduleDates(Date month, String organIdList, String type);
 
 	/**
 	 * @describe 课程调整

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

@@ -305,8 +305,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
     }
 
     @Override
-    public List<Date> getCourseScheduleDates(Date month, String organIdList) {
-        return courseScheduleDao.getCourseScheduleDate(month, organIdList);
+    public List<Date> getCourseScheduleDates(Date month, String organIdList, String type) {
+        return courseScheduleDao.getCourseScheduleDate(month, organIdList,type);
     }
 
     @Override
@@ -1370,7 +1370,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         Map<Long, CourseSchedule> oldCourseSchedules = new HashMap<>();
 
         newCourseSchedules.forEach(newCourseSchedule -> {
-
             if (newCourseSchedule.getStartClassTime().before(tomorrow) && sysUser.getUserType().equals(SysUserType.TEACHER)) {
                 throw new BizException("调整时间必须为明天及以后");
             }

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

@@ -445,17 +445,22 @@
             cs.leave_student_num_,
             cg.student_num_ total_student_num_,
             su.username_ teacher_name_,
-            ta.sign_in_status_ attendance_status_
+            ta.sign_in_status_ attendance_status_,
+            s.name_ school_name_
         FROM
             music_group mg
             LEFT JOIN class_group cg ON mg.id_ = cg.music_group_id_
             LEFT JOIN course_schedule cs ON cg.id_ = cs.class_group_id_
             LEFT JOIN sys_user su ON cs.teacher_id_=su.id_
             LEFT JOIN teacher_attendance ta ON cs.id_=ta.class_group_id_ AND ta.teacher_id_=cs.teacher_id_
+            LEFT JOIN school s ON mg.school_id_=s.id_
         WHERE
         (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
         AND FIND_IN_SET(mg.organ_id_,#{organIdList})
-        AND cs.id_ IS NOT NULL AND cg.group_type_ = 'MUSIC'
+        AND cs.id_ IS NOT NULL
+        <if test="type!=null">
+            AND cg.group_type_ = #{type}
+        </if>
         AND cs.class_date_ = DATE_FORMAT(#{date},'%Y-%m-%d')
         <include refid="global.limit"/>
     </select>
@@ -470,7 +475,10 @@
         WHERE
         (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
         AND FIND_IN_SET(mg.organ_id_,#{organIdList})
-        AND cs.id_ IS NOT NULL AND cg.group_type_ = 'MUSIC'
+        AND cs.id_ IS NOT NULL
+        <if test="type!=null">
+            AND cg.group_type_ = #{type}
+        </if>
         AND cs.class_date_ = DATE_FORMAT(#{date},'%Y-%m-%d')
     </select>
 
@@ -776,6 +784,9 @@
         <if test="month!=null">
             AND DATE_FORMAT( #{month}, '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
         </if>
+        <if test="type!=null and type!=''">
+            AND cs.type_=#{type}
+        </if>
         GROUP BY
         cs.class_date_
     </select>

mec-teacher/src/main/java/com/ym/mec/teacher/controller/VipGroupCategoryController.java

@@ -2,6 +2,8 @@ package com.ym.mec.teacher.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.TeacherDao;
+import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.entity.VipGroupCategory;
 import com.ym.mec.biz.service.VipGroupCategoryService;
 import com.ym.mec.common.controller.BaseController;
@@ -27,6 +29,8 @@ public class VipGroupCategoryController extends BaseController {
 
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
+	@Autowired
+	private TeacherDao teacherDao;
 
 	@ApiOperation("单查询")
 	@GetMapping(value = "/query")
@@ -41,7 +45,11 @@ public class VipGroupCategoryController extends BaseController {
 		if (Objects.isNull(user)) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
-		return succeed(vipGroupCategoryService.findAllByOrgan(user.getOrganId()));
+		Teacher teacher = teacherDao.get(user.getId());
+		if(Objects.isNull(teacher)){
+			return failed("教师信息不存在");
+		}
+		return succeed(vipGroupCategoryService.findAllByOrgan(teacher.getTeacherOrganId().toString()));
 	}
 
 	@ApiOperation("新增")

mec-web/src/main/java/com/ym/mec/web/controller/education/EducationCourseScheduleController.java

@@ -42,7 +42,7 @@ public class EducationCourseScheduleController extends BaseController {
 
     @ApiOperation(value = "根据月份获取乐团在该月有课的日期")
     @GetMapping("/getCourseScheduleDateByMonth")
-    public Object getCourseScheduleDateByMonth(@ApiParam(value = "月份", required = true) @RequestParam Date month) {
+    public Object getCourseScheduleDateByMonth(@ApiParam(value = "月份", required = true) @RequestParam Date month,String type) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (null == user) {
             throw new BizException("请登录");
@@ -51,7 +51,7 @@ public class EducationCourseScheduleController extends BaseController {
         if(Objects.isNull(employee)){
             throw new BizException("员工信息不存在");
         }
-        return succeed(scheduleService.getCourseScheduleDates(month,employee.getOrganIdList()));
+        return succeed(scheduleService.getCourseScheduleDates(month,employee.getOrganIdList(),type));
     }
 
     @ApiOperation(value = "根据日期获取当日排课")