...

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

@@ -132,7 +132,6 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
 
     /**
      * 获取班级的课程计划
-     *
      * @param classGroupList
      * @return
      */

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

@@ -305,14 +305,15 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	@Override
 	public Object findStudentCourseScheduleRecords(StudentCourseScheduleRecordQueryInfo queryInfo) {
 		SysUser user = sysUserFeignService.queryUserInfo();
+		queryInfo.setUserId(user.getId().longValue());
+		PageInfo pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 
 		if(queryInfo.getIsAttend()== YesOrNoEnum.YES){
-			return courseScheduleDao.findStudentCourseScheduleNotStartRecords(user.getId().longValue(),
-					queryInfo.getDate());
+			pageInfo.setRows(courseScheduleDao.findStudentCourseScheduleNotStartRecords(user.getId().longValue(),
+					queryInfo.getDate()));
+			return pageInfo;
 		}
 
-		queryInfo.setUserId(user.getId().longValue());
-		PageInfo pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);
 

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

@@ -45,6 +45,8 @@ public class DemoGroupServiceImpl extends BaseServiceImpl<Long, DemoGroup>  impl
 
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
+	@Autowired
+	private SubjectDao subjectDao;
 
 	@Override
 	public BaseDAO<Long, DemoGroup> getDAO() {
@@ -139,8 +141,8 @@ public class DemoGroupServiceImpl extends BaseServiceImpl<Long, DemoGroup>  impl
 				demoGroup,
 				coursePlanId,
 				classGroup.getId().longValue());
-		String[] classSubjects = courseScheduleDao.findClassSubjects(Arrays.asList(new Integer[]{classGroup.getId()}));
-		StringBuilder className=new StringBuilder(classSubjects[0].split("-")[1]);
+//		String[] classSubjects = courseScheduleDao.findClassSubjects(Arrays.asList(new Integer[]{classGroup.getId()}));
+		StringBuilder className=new StringBuilder(subjectDao.get(demoGroup.getSubjectId().intValue()).getName());
 		className.append("-");
 		className.append(CourseSchedule.CourseScheduleType.DEMO.getMsg());
 		courseScheduleByDemoGroup.setName(className.toString());
@@ -164,7 +166,7 @@ public class DemoGroupServiceImpl extends BaseServiceImpl<Long, DemoGroup>  impl
 	@Override
 	public PageInfo findTeacherDemoGroups(TeacherManageDemoGroupQueryInfo queryInfo) {
 		PageInfo pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
-		Map<String, Object> params = new HashMap<String, Object>();
+		Map<String, Object> params = new HashMap<>();
 		MapUtil.populateMap(params, queryInfo);
 
 		List dataList = null;

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

@@ -486,11 +486,13 @@
             cs.class_date_,
             cs.start_class_time_,
             cs.end_class_time_,
-            cs.teach_mode_
+            cs.teach_mode_,
+	        (cg.total_class_times_-cg.current_class_times_) rest_of_class_
         FROM
             class_group_student_mapper cgsm
             LEFT JOIN course_schedule cs ON cs.class_group_id_=cgsm.class_group_id_
             LEFT JOIN sys_user su ON cs.teacher_id_ = su.id_
+            LEFT JOIN class_group cg ON cgsm.class_group_id_=cg.id_
         WHERE cs.status_='NOT_START' AND cgsm.user_id_=#{userId} AND cs.class_date_=DATE_FORMAT(#{date},'%Y%m%d')
     </select>
 </mapper>

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

@@ -67,13 +67,13 @@
 		create_time_ = #{createTime},
 		</if>
 		<if test="status!=null">
-			status_=#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+			status_=#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		</if>
 		<if test="startTime!=null">
-			start_time_=#{startTime}
+			start_time_=#{startTime},
 		</if>
 		<if test="endTime!=null">
-			end_time_=#{endTime}
+			end_time_=#{endTime},
 		</if>
 		</set> WHERE id_ = #{id}
 	</update>

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

@@ -127,9 +127,9 @@ create_time_ = #{createTime},
 		SELECT
 			#{classGroupId} class_group_id_,
 			'NOT_START' status_,
-			DATE_FORMAT(dgcp.courses_start_time_,'%Y-%m-%d') class_date_,
-			dgcp.courses_start_time_ start_class_time_,
-			DATE_ADD(dgcp.courses_start_time_,INTERVAL #{demoGroup.singleClassMinutes} MINUTE) end_class_time_,
+			dgcp.course_date_ class_date_,
+			CONCAT(dgcp.course_date_,' ',dgcp.start_time_) start_class_time_,
+			DATE_ADD( CONCAT(dgcp.course_date_,' ',dgcp.start_time_),INTERVAL #{demoGroup.singleClassMinutes} MINUTE) end_class_time_,
 			#{demoGroup.userId} teacher_id_,
 			'ONLINE' teach_mode_,
 			'demo' type_

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

@@ -56,7 +56,7 @@ public class StudentCourseScheduleController extends BaseController {
     }
 
     @ApiOperation(value = "上课记录")
-    @GetMapping(value = "/findStudentCourseScheduleRecords",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @GetMapping(value = "/findStudentCourseScheduleRecords")
     public Object findStudentCourseScheduleRecords(StudentCourseScheduleRecordQueryInfo queryInfo){
         return succeed(scheduleService.findStudentCourseScheduleRecords(queryInfo));
     }