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

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

@@ -393,4 +393,13 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	 * @return java.util.List<com.ym.mec.biz.dal.dto.CourseScheduleEndDto>
 	 */
 	PageInfo<CourseScheduleEndDto> endFindCourseSchedules(EndCourseScheduleQueryInfo queryInfo);
+
+	/**
+	 * @describe 陪练课程调整
+	 * @author Joburgess
+	 * @date 2020/2/9
+	 * @param courseSchedule:
+	 * @return void
+	 */
+	void practiceCourseAdjust(CourseSchedule courseSchedule);
 }

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

@@ -2346,4 +2346,33 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         pageInfo.setRows(results);
         return pageInfo;
     }
+
+    @Override
+    public void practiceCourseAdjust(CourseSchedule courseSchedule) {
+        if(Objects.isNull(courseSchedule.getId())){
+            throw new BizException("请指定课程");
+        }
+        if(Objects.isNull(courseSchedule.getStartClassTime())){
+            throw new BizException("请指定上课时间");
+        }
+        CourseSchedule oldCourseSchedule = courseScheduleDao.get(courseSchedule.getId());
+        if(Objects.isNull(oldCourseSchedule)){
+            throw new BizException("未找到对应课程");
+        }
+        if(!oldCourseSchedule.getGroupType().equals(GroupType.PRACTICE)){
+            throw new BizException("请选择陪练课");
+        }
+        Integer practiceCourseMinutes=25;
+        SysConfig practiceCourseMinutesConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_COURSE_MINUTES);
+        if(Objects.nonNull(practiceCourseMinutesConfig)){
+            practiceCourseMinutes=practiceCourseMinutesConfig.getParanValue(Integer.class);
+        }
+        oldCourseSchedule.setClassDate(courseSchedule.getStartClassTime());
+        oldCourseSchedule.setStartClassTime(courseSchedule.getStartClassTime());
+        oldCourseSchedule.setEndClassTime(DateUtil.addMinutes(courseSchedule.getStartClassTime(),practiceCourseMinutes));
+        List<CourseSchedule> courseSchedules=new ArrayList<>();
+        courseSchedules.add(oldCourseSchedule);
+        checkNewCourseSchedules(courseSchedules,false);
+        courseScheduleDao.update(oldCourseSchedule);
+    }
 }

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

@@ -841,7 +841,7 @@
             <if test="status != null and status != 'TRUANT'">
                 AND sa.status_ = #{status}
             </if>
-            <if test="status != null and status = 'TRUANT'">
+            <if test="status != null and status == 'TRUANT'">
                 AND (sa.status_ = #{status} OR sa.status_ IS NULL)
             </if>
         </where>

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

@@ -303,4 +303,12 @@ public class CourseScheduleController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation(value = "陪练课调整")
+    @PostMapping("/practiceCourseAdjust")
+    @PreAuthorize("@pcs.hasPermissions('courseSchedule/practiceCourseAdjust')")
+    public Object practiceCourseAdjust(CourseSchedule courseSchedule){
+        scheduleService.practiceCourseAdjust(courseSchedule);
+        return succeed();
+    }
 }
+