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

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

@@ -33,6 +33,6 @@ public interface OnlineMusicGroupService {
      * @param teacherId
      * @return
      */
-    Map getTeacherFreeTimes(Integer studentId, Integer teacherId);
+    Map getTeacherFreeTimes(Integer studentId, Integer teacherId, boolean skipHoliday);
 
 }

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

@@ -377,7 +377,7 @@ public class OnlineMusicGroupServiceImpl implements OnlineMusicGroupService {
     }
 
     @Override
-    public Map getTeacherFreeTimes(Integer studentId, Integer teacherId){
+    public Map getTeacherFreeTimes(Integer studentId, Integer teacherId, boolean skipHoliday){
         if (Objects.isNull(teacherId)) {
             throw new BizException("请选择教师");
         }
@@ -405,6 +405,15 @@ public class OnlineMusicGroupServiceImpl implements OnlineMusicGroupService {
             checkTeacherLeaveDate = false;
         }
 
+        Set<String> holidayDays = new HashSet<>();
+
+        if (skipHoliday) {
+            SysConfig holidaySetting = sysConfigService.findByParamName(SysConfigService.HOLIDAY_SETTING);
+            if(Objects.nonNull(holidaySetting)&&StringUtils.isNotBlank(holidaySetting.getParanValue())){
+                holidayDays = new HashSet<>(JSON.parseArray(holidaySetting.getParanValue(), String.class));
+            }
+        }
+
         Set<Integer> disableApplyWeekNum = new HashSet<>();
         Set<Integer> disableApplyWeekDay = new HashSet<>();
 
@@ -566,6 +575,9 @@ public class OnlineMusicGroupServiceImpl implements OnlineMusicGroupService {
                 Map<String, List<String>> rt=new HashMap<>();
                 for (Date tempDate : tempDates) {
                     String dateStr = DateUtil.dateToString(tempDate, "yyyy-MM-dd");
+                    if(holidayDays.contains(dateStr)){
+                        continue;
+                    }
                     String timeStr = DateUtil.dateToString(tempDate, "HH:mm:ss");
                     if(!rt.containsKey(dateStr)){
                         rt.put(dateStr, new ArrayList<>());
@@ -696,6 +708,9 @@ public class OnlineMusicGroupServiceImpl implements OnlineMusicGroupService {
             Map<String, List<String>> rt=new HashMap<>();
             for (Date tempDate : tempDates) {
                 String dateStr = DateUtil.dateToString(tempDate, "yyyy-MM-dd");
+                if(holidayDays.contains(dateStr)){
+                    continue;
+                }
                 String timeStr = DateUtil.dateToString(tempDate, "HH:mm:ss");
                 if(!rt.containsKey(dateStr)){
                     rt.put(dateStr, new ArrayList<>());

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

@@ -96,7 +96,7 @@ public class EduOnlineMusicGroupController extends BaseController {
     @ApiOperation(value = "获取教师空闲时间")
     @GetMapping("/getTeacherFreeTimes")
 //    @PreAuthorize("@pcs.hasPermissions('eduOnlineMusic/getTeacherFreeTimes')")
-    public HttpResponseResult getTeacherFreeTimes(Integer studentId, Integer teacherId) {
+    public HttpResponseResult getTeacherFreeTimes(Integer studentId, Integer teacherId, boolean skipHoliday) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
@@ -104,7 +104,7 @@ public class EduOnlineMusicGroupController extends BaseController {
         if(Objects.isNull(studentId)){
             throw new BizException("请指定学生");
         }
-        return succeed(onlineMusicGroupService.getTeacherFreeTimes(studentId,teacherId));
+        return succeed(onlineMusicGroupService.getTeacherFreeTimes(studentId,teacherId,skipHoliday));
     }
 
     @ApiOperation(value = "检测学生是否存在进行中的乐团网管课")