Merge remote-tracking branch 'origin/master'

mec-web/src/main/java/com/ym/mec/web/controller/CourseScheduleController.java

@@ -3,13 +3,11 @@ package com.ym.mec.web.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.ClassGroupTeacherMapperDao;
+import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.dto.CoursePostponeDto;
 import com.ym.mec.biz.dal.dto.CreateCourseScheduleDto;
 import com.ym.mec.biz.dal.dto.VipGroupCourseAdjustInfoDto;
-import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
-import com.ym.mec.biz.dal.entity.CourseSchedule;
-import com.ym.mec.biz.dal.entity.CourseScheduleComplaints;
-import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.AuditStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.TeachModeEnum;
@@ -59,6 +57,8 @@ public class CourseScheduleController extends BaseController {
     private SysUserFeignService sysUserFeignService;
     @Autowired
     private MusicGroupService musicGroupService;
+    @Autowired
+    private EmployeeDao employeeDao;
 
     @ApiOperation(value = "排课")
     @PostMapping("/batchAddCourseSchedule")
@@ -279,8 +279,9 @@ public class CourseScheduleController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
+        Employee employee = employeeDao.get(sysUser.getId());
         if(StringUtils.isEmpty(queryInfo.getOrganIdList())){
-            queryInfo.setOrganIdList(sysUser.getOrganId());
+            queryInfo.setOrganIdList(employee.getOrganIdList());
         }
         return succeed(scheduleService.endFindCourseSchedules(queryInfo));
     }

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -244,6 +244,10 @@ public class ExportController extends BaseController {
                         row.setSporadicType("声部更改");
                     } else if (row.getChargeType().equals(4)) {
                         row.setSporadicType("乐器更换");
+                    }else if (row.getChargeType().equals(5)) {
+                        row.setSporadicType("维修费");
+                    }else if (row.getChargeType().equals(6)) {
+                        row.setSporadicType("福袋活动");
                     }
                 }
             }