Merge branch 'master' into feature-goods-river

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

@@ -2175,14 +2175,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         classGroup.setStudentNum(studentNum);
         if(classGroup.getGroupType().equals(GroupType.VIP)){
             VipGroup vipGroup=vipGroupDao.get(Long.parseLong(classGroup.getMusicGroupId()));
-            Date minClassDate = courseScheduleDao.getMinCourseTime(GroupType.VIP, vipGroup.getId().toString());
-            if(Objects.nonNull(minClassDate)){
-                vipGroup.setCourseStartDate(minClassDate);
-            }
-            Date maxClassDate = courseScheduleDao.getMaxCourseTime(GroupType.VIP, vipGroup.getId().toString());
-            if(Objects.nonNull(maxClassDate)){
-                vipGroup.setCoursesExpireDate(maxClassDate);
-            }
             if (currentClassTimes<totalClassTimes
                     &&vipGroup.getStatus().equals(VipGroupStatusEnum.FINISHED)){
                 vipGroup.setStatus(VipGroupStatusEnum.PROGRESS);

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

@@ -811,6 +811,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         errInfo.append("安排的课程存在冲突,");
         errInfo.append("冲突课程为：");
 
+        if (Objects.isNull(preCourseSchedule.getId()) && Objects.isNull(backCourseSchedule.getId())) {
+            errInfo.setLength(0);
+            errInfo.append("您设置的循环周期存在时间冲突");
+            return errInfo.toString();
+        }
+
         CourseSchedule courseSchedule = new CourseSchedule();
         if (Objects.nonNull(preCourseSchedule.getId()) && existCourseScheduleIds.contains(preCourseSchedule.getId())) {
             courseSchedule = preCourseSchedule;
@@ -843,6 +849,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         errInfo.append("(");
         errInfo.append(courseSchedule.getId());
         errInfo.append(")");
+
         errInfo.append("类型为：");
         switch (type) {
             case 1:
@@ -2214,8 +2221,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                         result.setGroupName(groupTemps.get(0).getGroupName());
                         result.setOrganName(groupTemps.get(0).getOrganName());
                     }
-                    result.setTeacherName(nameIdMap.get(result.getActualTeacherId()));
                 }
+                result.setTeacherName(nameIdMap.get(result.getActualTeacherId()));
                 List<TeacherAttendance> courseTeacherAttendances = courseTeacherAttendanceMap.get(result.getId());
                 if(!CollectionUtils.isEmpty(courseTeacherAttendances)){
                     TeacherAttendance teacherAttendance=courseTeacherAttendances.get(0);

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

@@ -115,6 +115,9 @@ public class SporadicChargeInfoController extends BaseController {
             return failed("参数不合法");
         }
         SporadicChargeInfo chargeInfo = sporadicChargeInfoService.findByOrganIdAndType(organId, type);
+        if(chargeInfo == null){
+            return failed("分部活动不存在");
+        }
         return succeed(chargeInfo);
     }
 

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

@@ -1,6 +1,8 @@
 package com.ym.mec.student.controller;
 
 import com.ym.mec.biz.dal.dao.SysConfigDao;
+import com.ym.mec.biz.dal.entity.SporadicChargeInfo;
+import com.ym.mec.biz.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -38,11 +40,6 @@ import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
-import com.ym.mec.biz.service.MusicGroupService;
-import com.ym.mec.biz.service.StudentPaymentOrderDetailService;
-import com.ym.mec.biz.service.StudentPaymentOrderService;
-import com.ym.mec.biz.service.StudentRegistrationService;
-import com.ym.mec.biz.service.VipGroupService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.thirdparty.adapay.NotifyEvent;
@@ -77,6 +74,8 @@ public class StudentOrderController extends BaseController {
     private StudentPaymentOrderDao studentPaymentOrderDao;
     @Autowired
     private SysConfigDao sysConfigDao;
+    @Autowired
+    private SporadicChargeInfoService sporadicChargeInfoService;
 
     @PostMapping("/notify")
     public Msg notify(@ModelAttribute Msg msg) throws Exception {
@@ -130,6 +129,9 @@ public class StudentOrderController extends BaseController {
         } else if (orderByOrderNo.getGroupType().equals(GroupType.VIP)) {
             VipBuyResultDto vipBuyResultInfo = vipGroupService.findVipBuyResultInfo(Integer.valueOf(orderByOrderNo.getMusicGroupId()));
             orderDetail.put("detail", vipBuyResultInfo);
+        }else if(orderByOrderNo.getGroupType().equals(GroupType.SPORADIC)){
+            SporadicChargeInfo info = sporadicChargeInfoService.get(Integer.valueOf(orderByOrderNo.getMusicGroupId()));
+            orderDetail.put("detail", info);
         }
 
         return succeed(orderDetail);

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")
@@ -275,6 +275,14 @@ public class CourseScheduleController extends BaseController {
     @GetMapping("/superFindCourseSchedules")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/superFindCourseSchedules')")
     public Object superFindCourseSchedules(EndCourseScheduleQueryInfo queryInfo){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        Employee employee = employeeDao.get(sysUser.getId());
+        if(StringUtils.isEmpty(queryInfo.getOrganIdList())){
+            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("福袋活动");
                     }
                 }
             }