Merge branch 'master' into yonge

cms/src/main/java/com/ym/mec/cms/controller/HelpCenterCatalogController.java

@@ -3,6 +3,7 @@ package com.ym.mec.cms.controller;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 
 import java.util.Date;
 import java.util.List;
@@ -31,6 +32,7 @@ public class HelpCenterCatalogController extends BaseController {
 	@Autowired
 	private HelpCenterContentService helpCenterContentService;
 
+	@ApiOperation("分类列表分页查询")
 	@GetMapping(value = "list")
 	@ApiImplicitParams({ @ApiImplicitParam(name = "parentId", value = "父分类编号（可为空）", required = true, dataType = "Integer"),
 			@ApiImplicitParam(name = "status", value = "状态(1，显示 0，隐藏；可为空)", required = true, dataType = "Integer") })
@@ -39,6 +41,7 @@ public class HelpCenterCatalogController extends BaseController {
 		return succeed(dataList);
 	}
 
+	@ApiOperation("分类详情查询")
 	@GetMapping(value = "get")
 	@ApiImplicitParam(name = "id", value = "分类编号", required = true, dataType = "Integer", paramType = "path")
 	public Object findHelpCatalogById(Integer id) {
@@ -47,6 +50,7 @@ public class HelpCenterCatalogController extends BaseController {
 		return succeed(helpCenterCatalogService.get(id));
 	}
 
+	@ApiOperation("修改分类")
 	@PostMapping(value = "modify", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	public Object modifyHelpCatalog(HelpCenterCatalog helpCatalog) {
 		if (helpCatalog == null)
@@ -63,6 +67,7 @@ public class HelpCenterCatalogController extends BaseController {
 		}
 	}
 
+	@ApiOperation("删除分类")
 	@PostMapping(value = "delete", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	@ApiImplicitParam(name = "id", value = "分类编号", required = true, dataType = "Integer", paramType = "path")
 	public Object delHelpCatalog(Integer id) {

cms/src/main/java/com/ym/mec/cms/controller/HelpCenterContentControlller.java

@@ -2,6 +2,7 @@ package com.ym.mec.cms.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
 
 import java.util.Date;
 
@@ -31,6 +32,7 @@ public class HelpCenterContentControlller extends BaseController {
 	@Autowired
 	private HelpCenterCatalogService helpCenterCatalogService;
 
+	@ApiOperation("帮助中心内容列表分页查询")
 	@GetMapping(value = "list")
 	public Object findHelpContentByCondition(HelpCenterContentQueryInfo queryInfo) {
 
@@ -40,6 +42,7 @@ public class HelpCenterContentControlller extends BaseController {
 		return succeed(data);
 	}
 
+	@ApiOperation("帮助中心内容明细查询")
 	@GetMapping(value = "get")
 	@ApiImplicitParam(name = "id", value = "编号", required = true, dataType = "Integer", paramType = "path")
 	public Object findHelpContentByKey(Integer id) {
@@ -49,6 +52,7 @@ public class HelpCenterContentControlller extends BaseController {
 		return succeed(helpCenterContentService.get(id));
 	}
 
+	@ApiOperation("修改帮助中心内容")
 	@PostMapping(value = "modify", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	public Object modifyHelpContent(HelpCenterContent helpContent) {
 		if (helpContent == null) {
@@ -73,6 +77,7 @@ public class HelpCenterContentControlller extends BaseController {
 		}
 	}
 
+	@ApiOperation("删除帮助中心内容")
 	@PostMapping(value = "delete", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	@ApiImplicitParam(name = "id", value = "编号", required = true, dataType = "Integer", paramType = "path")
 	public Object delHelpContent(Integer id) {

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

@@ -1510,4 +1510,10 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @return
      */
     Date getLastTime(@Param("practiceGroupId") Long practiceGroupId, @Param("groupType") String groupType);
+
+    /**
+     * 重置上课学生人数
+     * @param courseScheduleId
+     */
+    void resetStudentNum(@Param("courseScheduleId") List<Long> courseScheduleId);
 }

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

@@ -711,7 +711,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     public List<ImGroupModel> queryUserGroups(Integer userId, String search) {
         List<ImGroupModel> imGroupModels = classGroupDao.queryUserMusicGroups(userId, search);
         imGroupModels.addAll(classGroupDao.queryUserVipGroups(userId, search));
-        imGroupModels.addAll(classGroupDao.queryUserPracticeGroups(userId, search));
+//        imGroupModels.addAll(classGroupDao.queryUserPracticeGroups(userId, search));
         imGroupModels.addAll(classGroupDao.queryUserCommGroups(userId, search));
         if (imGroupModels != null && imGroupModels.size() > 0) {
             imGroupModels.forEach(e -> {

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

@@ -3994,6 +3994,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         }
         teacherAttendanceDao.batchCleanCourseTeacherSignInfo(courseScheduleId);
         studentAttendanceDao.deleteByCourseSchedules(courseScheduleId);
+        //重置学生人数
+		courseScheduleDao.resetStudentNum(courseScheduleId);
     }
 
 	@Override

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

@@ -471,7 +471,12 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 			studentAttendance.setMusicGroupId(classGroup.getMusicGroupId());
 			studentAttendance.setUserId(userId);
 			studentAttendance.setTeacherId(courseSchedule.getActualTeacherId());
-
+			if(signStatusEnum == SignStatusEnum.SIGN_IN){
+				if(courseSchedule.getStudentNum() == null){
+					courseSchedule.setStudentNum(0);
+				}
+				courseSchedule.setStudentNum(courseSchedule.getStudentNum() + 1);
+			}
 			studentAttendanceDao.insert(studentAttendance);
 		}else {
 			studentAttendance.setTeacherId(courseSchedule.getActualTeacherId());
@@ -495,7 +500,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 				studentAttendance.setSignInTime(date);
 
 				courseSchedule.setUpdateTime(date);
-				courseSchedule.setStudentNum((courseSchedule.getStudentNum() == null?0:courseSchedule.getStudentNum()) + 1);
+//				courseSchedule.setStudentNum((courseSchedule.getStudentNum() == null?0:courseSchedule.getStudentNum()) + 1);
 				courseScheduleDao.update(courseSchedule);
 			}
 		}else if(signStatusEnum == SignStatusEnum.SIGN_OUT){

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

@@ -2906,7 +2906,13 @@
         UPDATE course_schedule
         SET name_=#{name}
         WHERE group_type_ = #{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-          AND music_group_id_ = #{groupId};
+          AND music_group_id_ = #{groupId}
+    </update>
+    <update id="resetStudentNum">
+        UPDATE course_schedule cs SET cs.student_num_ = 0 WHERE cs.id_ IN
+        <foreach collection="courseScheduleId" separator="," open="(" close=")" item="id">
+            #{id}
+        </foreach>
     </update>
 
     <select id="getStudentCourseScheduleNum" resultMap="com.ym.mec.biz.dal.dao.PracticeGroupDao.courseGroupExport">