Merge remote-tracking branch 'origin/master'

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

@@ -445,6 +445,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 						}
 					}
 
+					if (!DateUtil.isSameDay(courseSchedule.getStartClassTime(), courseSchedule.getEndClassTime())) {
+						throw new BizException("上课时间不允许跨天，请重新调整上课时间");
+					}
+
 					courseSchedule.setTeacherId(teacherId);
 					courseSchedule.setActualTeacherId(teacherId);
 					courseSchedule.setCreateTime(now);
@@ -2214,6 +2218,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                     courseSchedule.setClassDate(courseStartTime);
                     courseSchedule.setStartClassTime(courseStartTime);
                     courseSchedule.setEndClassTime(courseEndTime);
+
+					if (!DateUtil.isSameDay(courseSchedule.getStartClassTime(), courseSchedule.getEndClassTime())) {
+						throw new BizException("上课时间不允许跨天，请重新调整上课时间");
+					}
+					
                     if(vipGroupCourseAdjustInfo.getTeachMode().equals(TeachModeEnum.OFFLINE)){
 						courseSchedule.setSchoolId(vipGroup.getTeacherSchoolId());
 					}
@@ -2348,6 +2357,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             	int minutes = DateUtil.minutesBetween(oldCourseSchedule.getStartClassTime(), oldCourseSchedule.getEndClassTime());
             	newCourseSchedule.setEndClassTime(DateUtil.addMinutes(newCourseSchedule.getStartClassTime(), minutes));
             }
+            //判断上课时间是否跨天
+			if (!DateUtil.isSameDay(newCourseSchedule.getStartClassTime(), newCourseSchedule.getEndClassTime())) {
+				throw new BizException("上课时间不允许跨天，请重新调整上课时间");
+			}
             if(Objects.isNull(newCourseSchedule.getClassGroupId())){
                 newCourseSchedule.setClassGroupId(oldCourseSchedule.getClassGroupId());
             }

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

@@ -450,10 +450,22 @@
     <select id="ExportQueryPage" resultMap="orderAndDetail" parameterType="map">
         SELECT spo.*,u.username_,spod.id_ detail_id_,spod.type_ detail_type_,spod.price_
         detail_price_,spod.kit_group_purchase_type_ detail_kit_group_purchase_type_,
-        o.name_ organ_name,sci.charge_type_,g.id_ goods_id, g.name_ goods_name FROM student_payment_order spo
+        sci.charge_type_,g.id_ goods_id, g.name_ goods_name,o.name_ organ_name
+        FROM student_payment_order spo
         LEFT JOIN sys_user u on spo.user_id_ = u.id_
         LEFT JOIN student_payment_order_detail spod on spo.id_ = spod.payment_order_id_
-        LEFT JOIN organization o on spo.organ_id_ = o.id_
+        <if test='orderType != null and orderType.toString()=="0".toString()'>
+            LEFT JOIN organization o on spo.organ_id_ = o.id_
+        </if>
+        <if test='orderType != null and orderType.toString()=="1".toString()'>
+            LEFT JOIN organization o on spo.organ_id_ = o.id_
+        </if>
+        <if test='orderType != null and orderType.toString()=="2".toString()'>
+            LEFT JOIN organization o on spo.organ_id_ = o.id_
+        </if>
+        <if test='orderType != null and orderType.toString()=="3".toString()'>
+            LEFT JOIN organization o on spo.routing_organ_id_ = o.id_
+        </if>
         LEFT JOIN sporadic_charge_info sci on spo.music_group_id_ = sci.id_
         LEFT JOIN goods g on FIND_IN_SET(g.id_,spod.goods_id_list_)
         <include refid="queryPaymentOrder"/>

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

@@ -208,9 +208,9 @@ public class TeacherCourseScheduleController extends BaseController {
             }
         }
         
-        if (oldCourseSchedule.getGroupType().equals(GroupType.VIP)) {
+        /*if (oldCourseSchedule.getGroupType().equals(GroupType.VIP)) {
             vipGroupService.checkVipCourseIsInScore(Long.valueOf(oldCourseSchedule.getMusicGroupId()));
-        }
+        }*/
         
         if(Objects.isNull(classDateAdjustDto.getClassGroupId())){
             classDateAdjustDto.setClassGroupId(oldCourseSchedule.getClassGroupId());

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

@@ -447,7 +447,7 @@ public class ExportController extends BaseController {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
-            if (StringUtils.isEmpty(queryInfo.getOrganId()) && queryInfo.getOrderType().equals("3")) {
+            if (StringUtils.isEmpty(queryInfo.getRoutingOrganId()) && queryInfo.getOrderType().equals("3")) {
                 queryInfo.setRoutingOrganId(employee.getOrganIdList());
             } else if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -651,7 +651,7 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "评论列表导出")
     @RequestMapping("export/courseReviews")
     @PreAuthorize("@pcs.hasPermissions('export/courseReviews')")
-    public void export(CourseReviewQueryInfo queryInfo, HttpServletResponse response) throws IOException {
+    public void courseReviews(CourseReviewQueryInfo queryInfo, HttpServletResponse response) throws IOException {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());