1、网管课初始类型

2、网管试听课

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/PracticeGroupDao.java

@@ -272,4 +272,13 @@ public interface PracticeGroupDao extends com.ym.mec.common.dal.BaseDAO<Long, Pr
      * @return java.lang.Integer
      */
     Integer findLastPracticeSubject(@Param("studentId") Integer studentId);
+
+    /**
+     * @describe 获取学生的网管试听课
+     * @author Joburgess
+     * @date 2020/4/24
+     * @param studentId:
+     * @return java.util.List<com.ym.mec.biz.dal.entity.PracticeGroup>
+     */
+    List<PracticeGroup> findStudentTrialPractices(@Param("studentId") Integer studentId);
 }

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

@@ -83,4 +83,13 @@ public interface EduPracticeGroupService {
      */
     HttpResponseResult createTrialPracticeGroup(PracticeGroupBuyDto practiceGroupBuyParams, String operatorInfo);
 
+    /**
+     * @describe 获取学生的试听课
+     * @author Joburgess
+     * @date 2020/4/24
+     * @param studentId:
+     * @return java.util.List<com.ym.mec.biz.dal.entity.PracticeGroup>
+     */
+    Map<String, Object> getStudentTrialPractices(Integer studentId);
+
 }

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

@@ -905,15 +905,9 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
         courseDates.sort(Comparator.comparing(Date::getTime));
 
         Date now=new Date();
-        LocalDate courseStartDay=LocalDate.now();
-
-        courseStartDay=courseStartDay.plusDays(1);
-        Date courseStartDate=Date.from(courseStartDay.atStartOfDay(DateUtil.zoneId).toInstant());
-        practiceGroupBuyParams.setCoursesStartDate(courseStartDate);
-        LocalDate currentExpiredDay = courseStartDay.plusMonths(practiceGroupBuyParams.getBuyMonths());
-        Date courseExpiredDate=Date.from(currentExpiredDay.atStartOfDay(DateUtil.zoneId).toInstant());
-        courseExpiredDate = DateUtil.addSeconds(courseExpiredDate, -1);
-        practiceGroupBuyParams.setCoursesExpireDate(courseExpiredDate);
+        if(courseDates.get(0).before(now)){
+            throw new BizException("课程开始时间不得小于当前时间");
+        }
 
         practiceGroupBuyParams.setName(subject.getName() + "•" + sysUser.getUsername());
 
@@ -925,7 +919,6 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
         practiceGroupBuyParams.setOrganId(sysUser.getOrganId());
         practiceGroupBuyParams.setSingleClassMinutes(practiceCourseMinutes);
         practiceGroupBuyParams.setGroupStatus(GroupStatusEnum.NORMAL);
-        practiceGroupBuyParams.setMemo(operatorInfo+"，试听课创建");
         practiceGroupBuyParams.setType(PracticeGroupType.TRIAL);
         practiceGroupDao.insert(practiceGroupBuyParams);
 
@@ -987,7 +980,7 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
             CourseSchedule courseSchedule=new CourseSchedule();
             LocalDateTime courseStartDateTime = LocalDateTime.ofInstant(courseDate.toInstant(), DateUtil.zoneId);
             LocalDateTime courseEndDateTime = courseStartDateTime.plusMinutes(practiceCourseMinutes);
-            courseSchedule.setClassDate(Date.from(courseStartDay.atStartOfDay(DateUtil.zoneId).toInstant()));
+            courseSchedule.setClassDate(Date.from(courseStartDateTime.atZone(DateUtil.zoneId).toInstant()));
             courseSchedule.setStartClassTime(Date.from(courseStartDateTime.atZone(DateUtil.zoneId).toInstant()));
             courseSchedule.setEndClassTime(Date.from(courseEndDateTime.atZone(DateUtil.zoneId).toInstant()));
             courseSchedule.setName(practiceGroupBuyParams.getName());
@@ -1067,4 +1060,20 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
         }
         return BaseController.succeed();
     }
+
+    @Override
+    public Map<String, Object> getStudentTrialPractices(Integer studentId) {
+        List<PracticeGroup> studentTrialPractices = practiceGroupDao.findStudentTrialPractices(studentId);
+        Integer existNoMemoGroup = 0;
+        for (PracticeGroup studentTrialPractice : studentTrialPractices) {
+            if (StringUtils.isBlank(studentTrialPractice.getMemo())){
+                existNoMemoGroup=1;
+                break;
+            }
+        }
+        Map<String, Object> result=new HashMap<>();
+        result.put("existNoMemoGroup", existNoMemoGroup);
+        result.put("practices", studentTrialPractices);
+        return result;
+    }
 }

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

@@ -566,4 +566,25 @@
         LEFT JOIN practice_group pg ON cssp.music_group_id_=pg.id_
         WHERE cssp.group_type_='PRACTICE' AND cssp.user_id_=#{studentId} ORDER BY CONCAT(cs.class_date_, ' ', cs.start_class_time_) DESC LIMIT 1
     </select>
+
+    <select id="findStudentTrialPractices" resultMap="PracticeGroupDto">
+        SELECT
+            pg.id_,
+            pg.name_,
+            pg.user_id_,
+            su.real_name_ teacher_name_,
+            MIN(CONCAT(cs.class_date_, ' ', cs.start_class_time_)) courses_start_date_,
+            MAX(CONCAT(cs.class_date_, ' ', cs.end_class_time_)) courses_expire_date_,
+            pg.memo_
+        FROM
+            practice_group pg
+            LEFT JOIN course_schedule cs ON cs.music_group_id_ = pg.id_
+            LEFT JOIN sys_user su ON su.id_=pg.user_id_
+        WHERE
+            pg.student_id_ = #{studentId}
+            AND cs.group_type_ = 'PRACTICE'
+            AND pg.type_ = 'TRIAL'
+        GROUP BY pg.id_
+        ORDER BY pg.id_
+    </select>
 </mapper>

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

@@ -6,6 +6,7 @@ import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dto.PracticeGroupBuyDto;
 import com.ym.mec.biz.dal.entity.Employee;
+import com.ym.mec.biz.dal.entity.PracticeGroup;
 import com.ym.mec.biz.dal.page.StudentQueryInfo;
 import com.ym.mec.biz.service.EduPracticeGroupService;
 import com.ym.mec.biz.service.PracticeGroupService;
@@ -245,4 +246,21 @@ public class EduPracticeGroupController extends BaseController {
         return eduPracticeGroupService.createTrialPracticeGroup(practiceGroupBuyParams, sysUser.getRealName()+"("+sysUser.getId()+")");
     }
 
+    @ApiOperation("获取学生的试听课")
+    @GetMapping(value = "/getStudentTrialPractices")
+    public HttpResponseResult getStudentTrialPractices(Integer studentId){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        return succeed(eduPracticeGroupService.getStudentTrialPractices(studentId));
+    }
+
+    @ApiOperation("更新课程组信息")
+    @GetMapping(value = "/updatePractice")
+    public HttpResponseResult updatePractice(PracticeGroup practiceGroup){
+        practiceGroupService.update(practiceGroup);
+        return succeed();
+    }
+
 }