Merge remote-tracking branch 'origin/yonge' into yonge

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

@@ -45,6 +45,7 @@ public class NewsController extends BaseController {
 	@ApiOperation("资讯列表分页查询")
 	@GetMapping(value = "/homeList")
 	public Object getHomeList(NewsInformationQueryInfo queryInfo) {
+		queryInfo.setRows(5);
 		SysUser user = sysUserFeignService.queryUserInfo();
 		return succeed(sysNewsInformationService.getHomeList(user, queryInfo));
 	}

cms/src/main/java/com/ym/mec/cms/service/impl/SysNewsInformationServiceImpl.java

@@ -33,7 +33,7 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 	
 	@Autowired
 	private WebFeignService webFeignService;
-	
+
 	@Value("${cms.server.context.path}")
 	private String serverContextPath;
 	
@@ -130,7 +130,7 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 		SysNewsInformation info = new SysNewsInformation();
 		info.setOrder(1);
 
-		if (queryInfo.getTenantId() == 1 && date.after(startDate)) {
+		if (queryInfo.getTenantId() == 1 && date.after(startDate) && "18696158274".equals(user.getPhone()) == false) {
 			info.setCreateTime(date);
 			info.setUpdateTime(date);
 			if (isNewer) {
@@ -167,4 +167,4 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 		return pageInfo;
 	}
 
-}
+}

cms/src/main/resources/application.yml

@@ -26,7 +26,7 @@ spring:
     
   datasource:
     name: test
-    url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://47.114.1.200:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     username: mec_dev
     password: mec_dev
     # 使用druid数据源
@@ -76,4 +76,10 @@ management:
 
 ribbon:  
     ReadTimeout: 60000  
-    ConnectTimeout: 60000
+    ConnectTimeout: 60000
+
+
+cms:
+  server:
+    context:
+      path: http://admin.dayaedu.com/

cms/src/main/resources/bootstrap-dev.properties

@@ -1,9 +1,9 @@
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 #spring.profiles.active=dev
 #\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.99.212.176:8848
+spring.cloud.nacos.config.server-addr=47.114.1.200:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=e246d169-227d-4012-8c34-e90e057d95d2
+spring.cloud.nacos.config.namespace=a5c10b43-0c4d-4e3b-a0ad-9af651cfe89c
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}

codegen/src/main/resources/generateConfigration.xml

@@ -2,16 +2,16 @@
 <GenerateConfiguration>
 	<dbConfiguration>
 		<driverClass>com.mysql.jdbc.Driver</driverClass>
-		<url>jdbc:mysql://47.99.212.176:3306/mec_data_online</url>
-		<username>dayaData</username>
-		<password>dayaDataOnline2019</password>
-		<catalog>mec_data_online</catalog>
-		<schema>mec_data_online</schema>
+		<url>jdbc:mysql://47.114.176.40:3306/edu_saas</url>
+		<username>edu_saas</username>
+		<password>dayaDataOnline@2019</password>
+		<catalog>edu_saas</catalog>
+		<schema>edu_saas</schema>
 	</dbConfiguration>
 	<srcBase>e:/javabean</srcBase>
-	<pojoPackageName>com.ym.mec.biz.dal.entity</pojoPackageName>
-	<daoPackageName>com.ym.mec.biz.dal.dao</daoPackageName>
-	<servicePackageName>com.ym.mec.biz.service</servicePackageName>
+	<pojoPackageName>com.keao.edu.datasource.dal.entity</pojoPackageName>
+	<daoPackageName>com.keao.edu.datasource.dal.dao</daoPackageName>
+	<servicePackageName>com.keao.edu.datasource.service</servicePackageName>
 	<sqlmapPackageName>resources</sqlmapPackageName>
 	<sqlmapConfigPackageName>resources/config</sqlmapConfigPackageName>
 </GenerateConfiguration>

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysMenu.java

@@ -69,6 +69,16 @@ public class SysMenu {
 	@ApiModelProperty(value = "子节点列表",required = false)
 	private List<SysMenu> sysMenus;
 
+	private String memo;
+
+	public String getMemo() {
+		return memo;
+	}
+
+	public void setMemo(String memo) {
+		this.memo = memo;
+	}
+
 	public String getParentPermission() {
 		return parentPermission;
 	}

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -119,6 +120,15 @@ public class SysUser implements Serializable{
 	
 	private Integer teacherId;
 
+	@ApiModelProperty(value = "用户角色",required = false)
+	private List<Integer> roles;
+
+	@ApiModelProperty(value = "联系地址",required = false)
+	private String contactAddress;
+
+	@ApiModelProperty(value = "邮编",required = false)
+	private String postalCode;
+
 	public Integer getServiceTag() {
 		return serviceTag;
 	}
@@ -359,6 +369,29 @@ public class SysUser implements Serializable{
 		this.teacherId = teacherId;
 	}
 
+	public List<Integer> getRoles() {
+		return roles;
+	}
+
+	public void setRoles(List<Integer> roles) {
+		this.roles = roles;
+	}
+	public String getContactAddress() {
+		return contactAddress;
+	}
+
+	public void setContactAddress(String contactAddress) {
+		this.contactAddress = contactAddress;
+	}
+
+	public String getPostalCode() {
+		return postalCode;
+	}
+
+	public void setPostalCode(String postalCode) {
+		this.postalCode = postalCode;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/config/WebMvcConfig.java

@@ -1,8 +1,7 @@
 package com.ym.mec.auth.config;
 
-import java.util.ArrayList;
-import java.util.List;
-
+import com.ym.mec.common.config.EnumConverterFactory;
+import com.ym.mec.common.config.LocalFastJsonHttpMessageConverter;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -10,8 +9,8 @@ import org.springframework.format.FormatterRegistry;
 import org.springframework.http.MediaType;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import com.ym.mec.common.config.EnumConverterFactory;
-import com.ym.mec.common.config.LocalFastJsonHttpMessageConverter;
+import java.util.ArrayList;
+import java.util.List;
 
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
@@ -32,5 +31,4 @@ public class WebMvcConfig implements WebMvcConfigurer {
         converter.setSupportedMediaTypes(fastMediaTypes);
         return new HttpMessageConverters(converter);
     }
-
 }

mec-auth/mec-auth-server/src/main/resources/bootstrap-test.properties

@@ -1,7 +1,7 @@
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 #spring.profiles.active=dev
 #\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.99.212.176:8848
+spring.cloud.nacos.config.server-addr=47.114.1.200:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
 spring.cloud.nacos.config.namespace=02105743-16b8-46ab-87df-2aca0f3dbca3
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysMenuMapper.xml

@@ -23,6 +23,7 @@
         <result column="update_time_" property="updateTime"/>
         <result column="del_flag_" property="delFlag"/>
         <result column="hidden_" property="hid"/>
+        <result column="memo_" property="memo"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -39,8 +40,8 @@
     <insert id="insert" parameterType="com.ym.mec.auth.api.entity.SysMenu" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO sys_menu
-        (id_,name_,permission_,path_,parent_id_,icon_,component_,sort_,type_,create_time_,update_time_,hidden_,parent_permission_)
-        VALUES(#{id},#{name},#{permission},#{path},#{parentId},#{icon},#{component},#{sort},#{type},now(),now(),#{hid},#{parentPermission})
+        (id_,name_,permission_,path_,parent_id_,icon_,component_,sort_,type_,create_time_,update_time_,hidden_,parent_permission_,memo_)
+        VALUES(#{id},#{name},#{permission},#{path},#{parentId},#{icon},#{component},#{sort},#{type},now(),now(),#{hid},#{parentPermission},#{memo})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -86,6 +87,9 @@
             <if test="hid != null">
                 hidden_ = #{hid},
             </if>
+            <if test="memo != null">
+                memo_ = #{memo},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

mec-auth/mec-auth-server/src/main/resources/logback-spring.xml

@@ -27,29 +27,10 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.ym.mec" level="INFO" />
-
-	<!--开发环境:打印控制台 -->
-	<springProfile name="dev">
-		<root level="INFO">
-			<appender-ref ref="stdout" />
-			<appender-ref ref="file" />
-		</root>
-	</springProfile>
-	
-	<springProfile name="test">
-		<root level="INFO">
-			<appender-ref ref="stdout" />
-			<appender-ref ref="file" />
-		</root>
-	</springProfile>
-
-	<!--生产环境:输出到文件 -->
-	<springProfile name="prod">
-		<root level="WARN">
-			<appender-ref ref="stdout" />
-			<appender-ref ref="file" />
-		</root>
-	</springProfile>
+	<logger name="com.ym.mec" level="DEBUG" />
+	<root level="DEBUG">
+		<appender-ref ref="stdout" />
+		<appender-ref ref="file" />
+	</root>
 
 </configuration>

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

@@ -39,7 +39,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @params [musicGroupId]
      * @describe 获取所有班级
      */
-    List<ClassGroup> findAllClassGroupByMusicGroup(@Param("musicGroupId") String musicGroupId,@Param("classGroupType") String classGroupType);
+    List<ClassGroup> findAllClassGroupByMusicGroup(@Param("musicGroupId") String musicGroupId, @Param("classGroupType") String classGroupType);
 
     /**
      * 根据合奏班ID查询该合奏班下的子班级
@@ -74,11 +74,11 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
     List<ClassGroup> findClassGroupByIds(@Param("ids") String ids);
 
     /**
+     * @param classGroupIds: 班级编号列表
+     * @return java.util.List<com.ym.mec.biz.dal.entity.ClassGroup>
      * @describe 获取班级列表
      * @author Joburgess
      * @date 2020/2/20
-     * @param classGroupIds: 班级编号列表
-     * @return java.util.List<com.ym.mec.biz.dal.entity.ClassGroup>
      */
     List<ClassGroup> findClassGroupWithIds(@Param("classGroupIds") List<Integer> classGroupIds);
 
@@ -149,7 +149,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @param vipIds
      * @return
      */
-    List<Map<String, String>> findVipStuNames(@Param("vipIds") String vipIds,@Param("groupType") String groupType);
+    List<Map<String, String>> findVipStuNames(@Param("vipIds") String vipIds, @Param("groupType") String groupType);
 
     /**
      * 获取班级下的学员列表
@@ -483,7 +483,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @author Joburgess
      * @date 2019/11/4
      */
-    ClassGroup findByCourseSchedule(Integer courseScheduleId);
+    ClassGroup findByCourseSchedule(@Param("courseScheduleId") Integer courseScheduleId, @Param("delFlag") Integer delFlag);
 
     /**
      * @param maxCourseScheduleId: 合奏班编号
@@ -506,11 +506,11 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
     int batchUpdateClassGroupCourseTimes(@Param("classGroupCourseTimes") Map<Integer, Integer> classGroupCourseTimes);
 
     /**
+     * @param classGroups:
+     * @return int
      * @describe
      * @author Joburgess
      * @date 2020/2/20
-     * @param classGroups:
-     * @return int
      */
     int batchUpdate(@Param("classGroups") List<ClassGroup> classGroups);
 
@@ -524,23 +524,23 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
 
 
     /**
+     * @param musicGroupId: 编号
+     * @param groupType:    类型
+     * @return com.ym.mec.biz.dal.entity.ClassGroup
      * @describe 根据乐团编号和类型获取班级
      * @author Joburgess
      * @date 2019/11/17
-     * @param musicGroupId: 编号
-     * @param groupType: 类型
-     * @return com.ym.mec.biz.dal.entity.ClassGroup
      */
     ClassGroup findByMusicGroupAndType(@Param("musicGroupId") String musicGroupId,
                                        @Param("groupType") String groupType);
 
     /**
+     * @param musicGroupId: 编号
+     * @param groupType:    类型
+     * @return com.ym.mec.biz.dal.entity.ClassGroup
      * @describe 根据乐团编号和类型获取班级
      * @author Joburgess
      * @date 2019/11/17
-     * @param musicGroupId: 编号
-     * @param groupType: 类型
-     * @return com.ym.mec.biz.dal.entity.ClassGroup
      */
     ClassGroup lockByMusicGroupAndType(@Param("musicGroupId") String musicGroupId,
                                        @Param("groupType") String groupType);
@@ -566,33 +566,33 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
     List<ClassGroupTeachersDto> findClassGroupByType(@Param("musicGroupId") String musicGroupId, @Param("type") ClassGroupTypeEnum type);
 
     /**
+     * @param groupIds:  乐团或vip课编号
+     * @param groupType: 类型
+     * @return java.util.List<java.util.Map < java.lang.String, java.lang.Integer>>
      * @describe 统计指定乐团或vip课的总课次
      * @author Joburgess
      * @date 2019/11/21
-     * @param groupIds: 乐团或vip课编号
-     * @param groupType: 类型
-     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>
      */
-    List<Map<String,Integer>> countGroupTotalClassTimes(@Param("groupIds") List<String> groupIds,
-                                                        @Param("groupType") String groupType);
+    List<Map<String, Integer>> countGroupTotalClassTimes(@Param("groupIds") List<String> groupIds,
+                                                         @Param("groupType") String groupType);
 
     /**
+     * @param groupIds:  乐团或vip课编号
+     * @param groupType: 类型
+     * @return java.util.List<java.util.Map < java.lang.String, java.lang.Integer>>
      * @describe 统计指定乐团或vip课的已上课次
      * @author Joburgess
      * @date 2019/11/21
-     * @param groupIds: 乐团或vip课编号
-     * @param groupType: 类型
-     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>
      */
-    List<Map<String,Integer>> countGroupOverClassTimes(@Param("groupIds") List<String> groupIds,
+    List<Map<String, Integer>> countGroupOverClassTimes(@Param("groupIds") List<String> groupIds,
                                                         @Param("groupType") String groupType);
 
     /**
+     * @param classGroupIds: 班级编号列表
+     * @return java.util.List<com.ym.mec.biz.dal.entity.ClassGroup>
      * @describe 获取班级列表
      * @author Joburgess
      * @date 2019/11/21
-     * @param classGroupIds: 班级编号列表
-     * @return java.util.List<com.ym.mec.biz.dal.entity.ClassGroup>
      */
     List<ClassGroup> findByClassGroupIds(@Param("classGroupIds") List<Integer> classGroupIds);
 
@@ -604,6 +604,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
 
     /**
      * 批量更新班级学生数减一
+     *
      * @param classGroupIdList
      * @return
      */
@@ -612,46 +613,48 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
     int updateTest(@Param("delFlag") YesOrNoEnum delFlag);
 
     /**
+     * @param groupId:   乐团编号
+     * @param groupType: 乐团类型
+     * @return com.ym.mec.biz.dal.entity.ClassGroup
      * @describe 根据乐团编号和类型获取班级
      * @author Joburgess
      * @date 2019/12/11
-     * @param groupId: 乐团编号
-     * @param groupType: 乐团类型
-     * @return com.ym.mec.biz.dal.entity.ClassGroup
      */
     ClassGroup findByGroupAndType(@Param("groupId") String groupId,
                                   @Param("groupType") String groupType);
 
     /**
+     * @param params: 查询条件
+     * @return java.util.List<com.ym.mec.biz.dal.dto.SuperClassGroupDtio>
      * @describe 终极班级查询
      * @author Joburgess
      * @date 2019/12/30
-     * @param params: 查询条件
-     * @return java.util.List<com.ym.mec.biz.dal.dto.SuperClassGroupDtio>
      */
     List<SuperClassGroupDto> superFindClassGroups(Map<String, Object> params);
+
     int superCountClassGroups(Map<String, Object> params);
 
     /**
+     * @param search:
+     * @return java.util.List<java.lang.Integer>
      * @describe 根据关键字查询学生相关的班级编号
      * @author Joburgess
      * @date 2019/12/31
-     * @param search:
-     * @return java.util.List<java.lang.Integer>
      */
     List<Integer> findClassGroupIdsByStudent(@Param("search") String search);
 
     /**
+     * @param search:
+     * @return java.util.List<java.lang.Integer>
      * @describe 根据关键字查询教师相关的班级编号
      * @author Joburgess
      * @date 2019/12/31
-     * @param search:
-     * @return java.util.List<java.lang.Integer>
      */
     List<Integer> findClassGroupIdsByTeacher(@Param("search") String search);
 
     /**
      * 获取基础技能版数量
+     *
      * @param musicGroupId
      * @return
      */
@@ -659,35 +662,37 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
 
     /**
      * 获取对应班级的声部名称列表
+     *
      * @param courseScheduleIds
      * @return
      */
     List<Map<Integer, String>> findClassGroupSubjectNameMaps(@Param("courseScheduleIds") List<Long> courseScheduleIds);
 
     /**
-     * @describe 根据团体删除班级
-     * @author Joburgess
-     * @date 2020/2/17
      * @param groupId:
      * @param groupType:
      * @return int
+     * @describe 根据团体删除班级
+     * @author Joburgess
+     * @date 2020/2/17
      */
     int deleteByGroup(@Param("groupId") String groupId,
-                      @Param("groupType")GroupType groupType);
+                      @Param("groupType") GroupType groupType);
 
     /**
-     * @describe 根据团体删除班级-逻辑删除
-     * @author Joburgess
-     * @date 2020/3/4
      * @param groupId:
      * @param groupType:
      * @return int
+     * @describe 根据团体删除班级-逻辑删除
+     * @author Joburgess
+     * @date 2020/3/4
      */
     int deleteByGroupWithLogic(@Param("groupId") String groupId,
                                @Param("groupType") GroupType groupType);
 
     /**
      * 获取vip所有班级列表
+     *
      * @param vipGroupIds
      * @return
      */
@@ -695,8 +700,36 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
 
     /**
      * 根据群编号，修改群名称
+     *
      * @param groupId
      * @param groupName
      */
     void updateGroupName(@Param("groupId") Integer groupId, @Param("groupName") String groupName);
+
+    /**
+     * 获取进行中乐团报名中基础技能班
+     *
+     * @param musicGroupId
+     * @param subjectId
+     * @param type
+     * @return
+     */
+    List<HighClassGroupDto> findHighClassGroupByTypeAndSubjectId(@Param("musicGroupId") String musicGroupId, @Param("subjectId") Integer subjectId, @Param("type") String type, @Param("classGroupIds") String classGroupIds);
+
+    /**
+     * 根据班级id获取基础技能班
+     *
+     * @param musicGroupId
+     * @param classGroupIds
+     * @return
+     */
+    List<HighClassGroupDto> findHighClassGroup(@Param("musicGroupId") String musicGroupId, @Param("classGroupIds") String classGroupIds);
+
+    /**
+     * 获取班级列表
+     * @param practiceGroupId
+     * @param groupType
+     * @return
+     */
+    List<ClassGroup> queryClassGroups(@Param("practiceGroupId") String practiceGroupId, @Param("groupType") String groupType);
 }

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

@@ -88,7 +88,9 @@ public interface ClassGroupStudentMapperDao extends BaseDAO<Long, ClassGroupStud
      */
     int deleteStudentByClassGroupId(@Param("classGroupId") Long classGroupId, @Param("userId") Long userId);
 
-    /**
+    int deleteClassGroupStudent(@Param("classGroupId") Long classGroupId, @Param("userId") Integer userId);
+
+  /**
      * @param classGroupId: 班级编号
      * @return java.lang.String[]
      * @describe 根据班级编号获取班级学生名称列表
@@ -244,6 +246,9 @@ public interface ClassGroupStudentMapperDao extends BaseDAO<Long, ClassGroupStud
     List<Map<Integer, Integer>> countClassGroupsStudentNum(@Param("classGroupIds") List<Integer> classGroupIds,
                                                            @Param("status")ClassGroupStudentStatusEnum status);
 
+    List<Map<String, Integer>> countGroupAllStudentNum(@Param("groupIds") List<String> groupIds,
+                                                        @Param("groupType") GroupType groupType);
+
     /**
      * @param classGroupId: 班级编号
      * @return java.util.List<java.util.Map < java.lang.Integer, java.lang.Integer>>
@@ -371,4 +376,11 @@ public interface ClassGroupStudentMapperDao extends BaseDAO<Long, ClassGroupStud
                                                     @Param("groupType") GroupType groupType,
                                                     @Param("userId") Integer userId,
                                                     @Param("status") ClassGroupStudentStatusEnum status);
+
+    /**
+     * 获取学员教务老师
+     * @param studentIds
+     * @return
+     */
+    List<StudentEduTeacherDto> getStudentEducationalTeachers(@Param("studentIds") List<Integer> studentIds);
 }

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

@@ -29,6 +29,14 @@ public interface ClassGroupTeacherMapperDao extends BaseDAO<Long, ClassGroupTeac
     List<ClassGroupTeacherMapper> findClassGroupTeachers(@Param("classGroupIds") String classGroupIds);
 
     /**
+     * 查询班级老师
+     *
+     * @param classGroupId
+     * @return
+     */
+    ClassGroupTeacherMapper getClassGroupTeachersRole(@Param("classGroupId") Integer classGroupId, @Param("teacherRole") String teacherRole);
+
+    /**
      * 批量删除班级的老师关联关系
      *
      * @param classGroupTeacherMapperList
@@ -120,4 +128,11 @@ public interface ClassGroupTeacherMapperDao extends BaseDAO<Long, ClassGroupTeac
      * @return
      */
     List<ClassGroupTeacherMapper> findByClassGroupIdsAndType(@Param("classGroupIds") List<Integer> classGroupIds, @Param("teacherRole") String teacherRole);
+
+    /**
+     * 批量修改班级关联的老师
+     * @param classGroupIds
+     * @param newTeacherId
+     */
+    void batchUpdateTeacherByClassId(@Param("classGroupIds") List<Integer> classGroupIds, @Param("oldTeacherId") Integer oldTeacherId, @Param("newTeacherId") Integer newTeacherId);
 }

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

@@ -68,4 +68,12 @@ public interface CourseScheduleComplaintsDao extends BaseDAO<Long, CourseSchedul
      * @param courseScheduleIds
      */
     void delByCourseScheduleIds(@Param("courseScheduleIds") List<Long> courseScheduleIds);
+
+    /**
+     * 获取课程用户的评价
+     *
+     * @param courseScheduleId
+     * @return
+     */
+    List<CourseScheduleComplaintsDto> findCourseIdComplaints(@Param("courseScheduleId") Long courseScheduleId);
 }

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

@@ -61,6 +61,8 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      */
     int batchDeleteCourseSchedules(@Param("courseScheduleIds") List<Long> courseScheduleIds);
 
+    int batchDeleteCourseSchedulesWithLogic(@Param("courseScheduleIds") List<Long> courseScheduleIds);
+
     int batchDeleteAllCourseSchedules(@Param("courseScheduleIds") List<Long> courseScheduleIds);
 
     /**
@@ -776,7 +778,7 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @author Joburgess
      * @date 2019/11/3
      */
-    List<CourseSchedule> findCourseScheduleWithDate(@Param("date") Date date);
+    List<CourseSchedule> findCourseScheduleWithDate(@Param("startDate") String startDate, @Param("endDate") String endDate);
 
     /**
      * @param classGroupId: 班级编号
@@ -1008,6 +1010,9 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      */
     List<Map<String, Long>> countTotalCourseScheduleNum(@Param("vipGroupIds") List<String> vipGroupIds, @Param("groupType") String groupType);
 
+    int countTotalCourseScheduleNumWithGroup(@Param("groupId") String groupId,
+                                                        @Param("groupType") String groupType);
+
     /**
      * 获取当前课时（已上）
      *
@@ -1281,6 +1286,10 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
     List<CourseSchedule> findUserCourses2(@Param("userId") Integer userId,
                                           @Param("teacherIds") List<Integer> teacherIds);
 
+
+    List<CourseSchedule> findUserCourses3(@Param("studentId") Integer studentId,
+                                          @Param("teacherIds") List<Integer> teacherIds);
+
     /**
      * @param userId:
      * @return java.util.List<com.ym.mec.biz.dal.entity.CourseSchedule>
@@ -1309,8 +1318,8 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @return java.util.List<java.util.Map<java.lang.Integer,java.lang.Integer>>
      */
     List<Map<Integer, Long>> countStudentVipCoursesWithDate(@Param("studentIds") List<Integer> studentIds,
-                                                               @Param("startTime") Date startTime,
-                                                               @Param("endTime") Date endTime,
+                                                            @Param("startTime") Date startTime,
+                                                            @Param("endTime") Date endTime,
                                                             @Param("groupType") GroupType groupType);
 
 
@@ -1324,8 +1333,8 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @return java.util.List<java.util.Map<java.lang.Integer,java.lang.Long>>
      */
     List<Map<Integer, Long>> countStudentPayPracticeCoursesWithDate(@Param("studentIds") List<Integer> studentIds,
-                                                            @Param("startTime") Date startTime,
-                                                            @Param("endTime") Date endTime);
+                                                                    @Param("startTime") Date startTime,
+                                                                    @Param("endTime") Date endTime);
 
     /**
      * @describe 统计学生在未来的vip课数量
@@ -1416,7 +1425,7 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @param groupType
      * @return
      */
-    List<CourseScheduleRateDto> findCourseRate(@Param("groupId") String groupId, @Param("groupType") String groupType);
+    List<CourseScheduleRateDto> findCourseRate(@Param("groupId") String groupId, @Param("groupType") String groupType, @Param("classGroupId") Integer classGroupId);
 
     /**
      * 获取最后一次已结束的课程
@@ -1425,7 +1434,7 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @param groupType
      * @return
      */
-    CourseSchedule getLastEndCourse(@Param("groupId") String groupId, @Param("groupType") String groupType);
+    CourseSchedule getLastEndCourse(@Param("groupId") String groupId, @Param("groupType") String groupType, @Param("classGroupId") Integer classGroupId);
 
     /**
      * 根据课程组获取课表信息
@@ -1517,4 +1526,21 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @param courseScheduleId
      */
     void resetStudentNum(@Param("courseScheduleId") List<Long> courseScheduleId);
+
+    /**
+     * 获取当前班级列表的所有未开始的课程
+     * @param classGroupIds
+     * @param teacherId
+     * @param teacherRole
+     * @return
+     */
+    List<CourseSchedule> queryNoStartCourseByTeacherId(@Param("classGroupIds") String classGroupIds, @Param("teacherId") Integer teacherId, @Param("teacherRole") String teacherRole);
+
+    /**
+     * 当前班级是否有未开始的课程
+     * @param classGroupIds
+     * @param teacherId
+     * @return
+     */
+    List<Map<Integer, Integer>> queryHasReatClass(@Param("classGroupIds") Set<String> classGroupIds, @Param("teacherId") String teacherId);
 }

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

@@ -98,6 +98,7 @@ public interface CourseScheduleReviewDao extends BaseDAO<Integer, CourseSchedule
 
     /**
      * 根据班级id获取班级学生
+     *
      * @param classGroupId
      * @return
      */
@@ -105,13 +106,45 @@ public interface CourseScheduleReviewDao extends BaseDAO<Integer, CourseSchedule
 
     /**
      * 删除课程评价
+     *
      * @param courseScheduleId
      */
     void delByCourseScheduleId(@Param("courseScheduleId") Long courseScheduleId);
 
     /**
      * 删除课程评价
+     *
      * @param courseScheduleIds
      */
     void delByCourseScheduleIds(@Param("courseScheduleIds") List<Long> courseScheduleIds);
+
+    /**
+     * 线上课评价列表
+     *
+     * @param params
+     * @return
+     */
+    List<CourseReviewDto> getOnlineCourseReviewList(Map<String, Object> params);
+
+    /**
+     * 线上课评价统计
+     *
+     * @param params
+     * @return
+     */
+    Integer countOnlineCourseReviews(Map<String, Object> params);
+
+    /**
+     * vip课评价列表
+     * @param params
+     * @return
+     */
+    List<CourseReviewDto> getVipCourseReviewList(Map<String, Object> params);
+
+    /**
+     * vip课评价统计
+     * @param params
+     * @return
+     */
+    Integer countVipCourseReviews(Map<String, Object> params);
 }

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

@@ -263,4 +263,55 @@ public interface CourseScheduleStudentPaymentDao extends BaseDAO<Long, CourseSch
      * @return java.util.List<java.util.Map<java.lang.Long,java.math.BigDecimal>>
      */
     List<Map<Long, BigDecimal>> findCoursePayment(@Param("courseScheduleIds") List<Long> courseScheduleIds);
+
+    /**
+     * 获取学员指定课程类型的剩余课时数
+     * @param studentId
+     * @param courseScheduleType
+     * @return
+     */
+    int countStudentNotStartCourseNumWithCourseType(@Param("studentId") Integer studentId,
+                                                    @Param("courseScheduleType")CourseSchedule.CourseScheduleType courseScheduleType);
+
+    /**
+     * 批量操作节拍器状态
+     * @param courseScheduleId
+     * @param userId
+     */
+    void adjustPlayMidi(@Param("courseScheduleId") long courseScheduleId, @Param("userId") String userId, @Param("content") String content);
+
+    /**
+     * 获取用户的节拍器信息
+     * @param userIds
+     * @param courseScheduleId
+     * @return
+     */
+    List<Map<Integer, String>> queryMidiByUserIdsAndCourseId(@Param("userIds") Set<String> userIds, @Param("courseScheduleId") String courseScheduleId);
+
+    /**
+     * 获取单个用户的midi
+     * @param courseScheduleId
+     * @param userId
+     * @return
+     */
+    String getMidiByCourseIdAndUserId(@Param("courseScheduleId") String courseScheduleId, @Param("userId") String userId);
+
+    /**
+     * @describe 统计课程组下的课程单价
+     * @author Joburgess
+     * @date 2020.06.11
+     * @param groupType:
+     * @param groupIds:
+     * @return java.util.List<java.util.Map<java.lang.String,java.math.BigDecimal>>
+     */
+    List<Map<String, BigDecimal>> findGroupCoursesUnitPrice(@Param("groupType") GroupType groupType,
+                                                            @Param("groupIds") List<String> groupIds);
+
+    /**
+     * 获取未进入教室的学员列表
+     * @param roomId
+     * @param courseScheduleId
+     * @return
+     */
+    List<RongyunBasicUserDto> queryNoJoinStu(@Param("roomId") String roomId, @Param("courseScheduleId") String courseScheduleId);
 }

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

@@ -62,7 +62,7 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 	 * @params [days:天数]
 	 * @describe 获取多少天之前的未结算教师课酬记录（vip课）
 	 */
-	List<CourseScheduleTeacherSalary> findSomeDayAgoTeacherCourseSalaryNoSettlement(@Param("days") Integer days);
+	List<CourseScheduleTeacherSalary> findSomeDayAgoTeacherCourseSalaryNoSettlement(@Param("startDate") String startDate,@Param("endDate") String endDate);
 
 	List<CourseScheduleTeacherSalary> findTemp();
 
@@ -73,7 +73,7 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 	 * @params [days:天数]
 	 * @describe 获取多少天之前的未结算教师课酬记录（陪练课课）
 	 */
-	List<CourseScheduleTeacherSalary> findTeacherCourseSalaryNoSettlement(@Param("days") Integer days,@Param("groupType") String groupType);
+	List<CourseScheduleTeacherSalary> findTeacherCourseSalaryNoSettlement(@Param("startDate") String startDate,@Param("endDate") String endDate);
 
 	/**
 	 * 查询老师指定课程的课酬
@@ -120,6 +120,17 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 	int batchUpdate(@Param("courseScheduleTeacherSalaries") List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries);
 
 	/**
+	 * @describe 更新指定课程的课酬
+	 * @author Joburgess
+	 * @date 2020.06.10
+	 * @param courseIds:
+	 * @param salary:
+	 * @return int
+	 */
+	int batchUpdateCourseSalarys(@Param("courseIds") List<Long> courseIds,
+								 @Param("salary") BigDecimal salary);
+
+	/**
 	 * @describe 根据课程编号与老师编号删除对应教师课酬记录
 	 * @author Joburgess
 	 * @date 2019/12/2
@@ -358,7 +369,7 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 	 * @param endDate
 	 * @return
 	 */
-	List<TeacherVipSalaryDto> queryOnlineCourseByGroupType(@Param("startDate") Date startDate, @Param("endDate") Date endDate);
+	List<TeacherVipSalaryDto> queryOnlineCourseByGroupType(@Param("startDate") String startDate, @Param("endDate") String endDate);
 	/**
 	 * 该用户是不是这个群组的老师
 	 * @param groupId
@@ -470,4 +481,25 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
      * @return java.util.List<java.util.Map<java.lang.Long,java.util.Date>>
      */
     List<Map<Long, String>> getCoursesSettlementTime(@Param("courseScheduleIds") List<Long> courseScheduleIds);
+
+	/**
+	 * 获取课程是否有课酬
+	 * @param courseScheduleIds
+	 * @return
+	 */
+	int getHasTeacherSalaryCount(@Param("courseScheduleIds") List<Long> courseScheduleIds);
+
+	/**
+	 * 根据助教主教获取教师列表
+	 * @param classGroupId
+	 * @return
+	 */
+    List<Integer> queryTeacherByTeaching(@Param("classGroupId") Integer classGroupId);
+
+	/**
+	 * 根据助教主教获取教师列表
+	 * @param classGroupId
+	 * @return
+	 */
+    Integer queryTeacherByBishop(@Param("classGroupId") Integer classGroupId);
 }

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

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.CoursesGroupModifyLog;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface CoursesGroupModifyLogDao extends BaseDAO<Long, CoursesGroupModifyLog> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.DegreeRegistration;
+import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface DegreeRegistrationDao extends BaseDAO<Integer, DegreeRegistration> {
+
+    DegreeRegistration findByMobileAndSporadicId(@Param("mobile") String mobile, @Param("sporadicId") Integer sporadicId);
+
+    DegreeRegistration getLock(@Param("id") Integer id);
+
+    DegreeRegistration getTotalAmount(Map<String, Object> params);
+}

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

@@ -1,7 +1,10 @@
 package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.BasicUserDto;
+import com.ym.mec.biz.dal.dto.SimpleUserDto;
 import com.ym.mec.biz.dal.entity.ExtracurricularExercises;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -11,4 +14,28 @@ public interface ExtracurricularExercisesDao extends BaseDAO<Long, Extracurricul
     int countExtraExercises(Map<String, Object> params);
     List<ExtracurricularExercises> findExtraExercises(Map<String, Object> params);
 
+    /**
+     * 查询同一个老师对同一批学员布置相同作业的最新记录
+     * @param teacherId
+     * @param studentIdList
+     * @param content
+     * @return
+     */
+    ExtracurricularExercises findRepeatLastExercises(@Param("teacherId") Integer teacherId,
+                             @Param("studentIdList") String studentIdList,
+                             @Param("content") String content);
+
+    /**
+     * @describe 获取教师在指定时间后未服务的学员
+     * @author Joburgess
+     * @date 2020.05.28
+     * @param teacherId:
+     * @param startDate:
+     * @param search:
+     * @return java.util.List<com.ym.mec.biz.dal.dto.SimpleUserDto>
+     */
+    List<BasicUserDto> findNoExercisesStudentsInThisWeekWithTeacher(@Param("teacherId") Integer teacherId,
+                                                                    @Param("startDate") String startDate,
+                                                                    @Param("search") String search);
+
 }

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

@@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public interface ExtracurricularExercisesReplyDao extends BaseDAO<Long, ExtracurricularExercisesReply> {
 
@@ -97,6 +98,28 @@ public interface ExtracurricularExercisesReplyDao extends BaseDAO<Long, Extracur
     List<StudentServiceDetailDto> findStudentHomeworkDetailsInTimeZone(Map<String, Object> params);
     int countStudentHomeworkDetailsInTimeZone(Map<String, Object> params);
 
+    /**
+     * @describe 获取在指定时间段内指定学员的课外训练
+     * @author Joburgess
+     * @date 2020.05.27
+     * @param startDate:
+     * @param endDate:
+     * @param studentIds:
+     * @return java.util.List<com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply>
+     */
+	List<ExtracurricularExercisesReply> getStudentExercisesWithTimeZone(@Param("startDate") String startDate,
+                                                                        @Param("endDate") String endDate,
+                                                                        @Param("studentIds") List<Integer> studentIds);
 
-	
+    /**
+     * @describe
+     * @date 2020.06.15
+     * @param startDate:
+     * @param endDate:
+     * @param studentIds:
+     * @return java.util.Set<java.lang.Integer>
+     */
+    Set<Integer> checkStudentHaveExercisesInDateRange(@Param("startDate") String startDate,
+                                                     @Param("endDate") String endDate,
+                                                     @Param("studentIds") List<Integer> studentIds);
 }

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

@@ -2,6 +2,8 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.MusicCardDto;
+import com.ym.mec.biz.dal.dto.MusicGroupRegisterDto;
+import com.ym.mec.biz.dal.dto.RegisterSubjectDto;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.School;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
@@ -173,15 +175,25 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
     MusicGroup findUserMusicGroup(@Param("userId") Integer userId);
 
     /**
+     * @param userId: 用户编号
+     * @return com.ym.mec.biz.dal.entity.MusicGroup
      * @describe 查询用户的乐团信息
      * @author Joburgess
      * @date 2020/2/4
-     * @param userId: 用户编号
-     * @return com.ym.mec.biz.dal.entity.MusicGroup
      */
     List<MusicGroup> findUserMusicGroups(@Param("userId") Integer userId);
 
     /**
+     * 查询乐团列表
+     *
+     * @param params
+     * @return
+     */
+    List<MusicGroup> findMusicGroups(Map<String, Object> params);
+
+    int countMusicGroups(Map<String, Object> params);
+
+    /**
      * 获取乐团信息
      *
      * @param list
@@ -199,6 +211,7 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
 
     /**
      * 查询用户的学校
+     *
      * @param userId
      * @return
      */
@@ -206,6 +219,7 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
 
     /**
      * 根据班级群，获取乐团信息
+     *
      * @param groupId
      * @return
      */
@@ -213,15 +227,25 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
 
     /**
      * 获取用户所在乐团名
+     *
      * @param userIds
      * @return
      */
-    List<Map<Integer,String>> queryUserMusicNames(@Param("userIds") Set<Integer> userIds);
+    List<Map<Integer, String>> queryUserMusicNames(@Param("userIds") Set<Integer> userIds);
 
     /**
      * 获取用户再乐团的状态
+     *
      * @param userIds
      * @return
      */
-    List<Map<Integer,String>> queryUserMusicStatus(@Param("userIds") Set<Integer> userIds);
+    List<Map<Integer, String>> queryUserMusicStatus(@Param("userIds") Set<Integer> userIds);
+
+    List<MusicGroupRegisterDto> getMusicGroupRegister(@Param("organIds") String organIds);
+
+    List<RegisterSubjectDto> getRegisterSubjectNum(@Param("musicGroupIds") List<String> musicGroupIds);
+
+    List<MusicGroupRegisterDto> getMusicGroupRegisterOrder(@Param("musicGroupIds") List<String> musicGroupIds);
+
+    List<MusicGroupRegisterDto> getMusicGroupRegisterTotalMoney(@Param("musicGroupIds") List<String> musicGroupIds);
 }

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

@@ -1,22 +1,28 @@
 package com.ym.mec.biz.dal.dao;
 
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
-import com.ym.mec.common.dal.BaseDAO;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
+import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
+import com.ym.mec.common.dal.BaseDAO;
 
 public interface MusicGroupPaymentCalenderDao extends BaseDAO<Long, MusicGroupPaymentCalender> {
 
-
     /**
      * 根据乐团编号删除乐团缴费周期
+     *
      * @param musicGroupId
      */
     void delByGroupId(String musicGroupId);
 
     /**
      * 根据乐团编号获取乐团缴费日历
+     *
      * @param musicGroupId
      * @return
      */
@@ -24,8 +30,69 @@ public interface MusicGroupPaymentCalenderDao extends BaseDAO<Long, MusicGroupPa
 
     /**
      * 批量新增乐团缴费周期
+     *
      * @param calender
      * @param musicGroupId
      */
-    void batchAdd(@Param("calender") List<Integer> calender,@Param("musicGroupId") String musicGroupId);
+    void batchAdd(@Param("calender") List<Integer> calender, @Param("musicGroupId") String musicGroupId);
+
+    /**
+     * 批量修改
+     *
+     * @param musicGroupPaymentCalenderList
+     * @return
+     */
+    int batchUpdate(List<MusicGroupPaymentCalender> musicGroupPaymentCalenderList);
+
+    /**
+     * 查询指定状态的记录
+     *
+     * @param status
+     * @return
+     */
+    List<MusicGroupPaymentCalender> queryByPaymentStatus(@Param("status") List<PaymentStatusEnum> status);
+
+    /**
+     * 获取缴费信息锁
+     *
+     * @param id
+     * @return
+     */
+    MusicGroupPaymentCalender getForLock(@Param("id") Long id);
+
+    /**
+     * 根据指定乐团的缴费日期查询交集
+     *
+     * @param musicGroupId        乐团编号
+     * @param startPaymentDate    开始缴费日期
+     * @param deadlinePaymentDate 截止缴费日期
+     * @return
+     */
+    int queryIntersectionByPaymentDate(@Param("musicGroupId") String musicGroupId, @Param("startPaymentDate") Date startPaymentDate,
+                                       @Param("deadlinePaymentDate") Date deadlinePaymentDate);
+
+    /**
+     * 统计预计缴费人数
+     *
+     * @param collect
+     * @return
+     */
+    List<Map<Long, Long>> countExpectNum(@Param("collect") Set<Long> collect);
+
+    /**
+     * 统计预计缴费人数
+     *
+     * @param collect
+     * @return
+     */
+    List<Map<Long, Long>> countActualNum(@Param("collect") Set<Long> collect);
+
+    /**
+     * 乐团最后一次交费信息
+     * @param musicGroupId
+     * @return
+     */
+    MusicGroupPaymentCalender getLastStartOne(@Param("musicGroupId") String musicGroupId);
+
+    int queryIntersectionByDate(@Param("musicGroupId") String musicGroupId, @Param("startTime") String startTime, @Param("endTime") String endTime);
 }

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

@@ -0,0 +1,138 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.dto.SimpleUserDto;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail;
+import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public interface MusicGroupPaymentCalenderDetailDao extends BaseDAO<Long, MusicGroupPaymentCalenderDetail> {
+
+	/**
+	 * 批量新增
+	 * @param musicGroupPaymentCalenderDetailList
+	 * @return
+	 */
+	int batchInsert(List<MusicGroupPaymentCalenderDetail> musicGroupPaymentCalenderDetailList);
+
+	/**
+	 * 获取列表
+	 * @param ids
+	 * @return
+	 */
+    List<MusicGroupPaymentCalenderDetail> queryListByIds(@Param("ids") String ids);
+
+	/**
+	 * 批量修改
+	 * @param calenderDetails
+	 */
+	void batchUpdate(@Param("calenderDetails") List<MusicGroupPaymentCalenderDetail> calenderDetails);
+
+	/**
+	 * 根据指定的日历编号查询
+	 * @param musicGroupPaymentCalenderId
+	 * @return
+	 */
+	List<MusicGroupPaymentCalenderDetail> queryByCalenderId(Long musicGroupPaymentCalenderId);
+
+	/**
+	 * 根据声部获取乐团下完成缴费的学员
+	 * @param musicGroupId
+	 * @param subjectId
+	 * @return
+	 */
+	List<SimpleUserDto> findMusicGroupStudentWithSubject(@Param("musicGroupId") String musicGroupId,
+														 @Param("subjectId") Integer subjectId);
+
+	/**
+	 * 统计实际收款金额
+	 * @param id
+	 * @return
+	 */
+	BigDecimal sumActualAmount(@Param("id") Long id);
+
+	/**
+	 * 获取学生最后一期续费记录
+	 * @param musicGroupId
+	 * @param userId
+	 * @return
+	 */
+	MusicGroupPaymentCalenderDetail getUserLastCalenderDetail(@Param("musicGroupId") String musicGroupId, @Param("userId") Integer userId);
+
+	/**
+	 * 获取可开启缴费的数据集
+	 * @param ids
+	 * @return
+	 */
+	List<MusicGroupPaymentCalenderDetail> queryCanOpenList(@Param("ids") String ids);
+
+	/**
+	 * 当前用户是否有进行中的订单
+	 * @param musicGroupId
+	 * @param userId
+	 * @return
+	 */
+	int queryIntersectionByPaymentDate(@Param("musicGroupId") String musicGroupId, @Param("userId") Integer userId);
+
+	/**
+	 * 刷新学员乐团付费状态
+	 */
+	void refreshUserMusicGroupPaymentStatusTask();
+
+	/**
+	 * 获取可以推送缴费提醒的列表
+	 * @param musicGroupPaymentCalenderId
+	 * @return
+	 */
+	List<MusicGroupPaymentCalenderDetail> queryCanPushList(@Param("musicGroupPaymentCalenderId") Long musicGroupPaymentCalenderId);
+
+	/**
+	 * 获取当天创建，已开启缴费，并且未缴费的用户列表
+	 * @return
+	 */
+	List<MusicGroupPaymentCalenderDetail> queryNoPaymentCanPushList();
+
+	/**
+	 * 获取学员对应的乐团
+	 * @return
+	 */
+	List<Map<Integer, String>> queryPaymentPushMap();
+
+	/**
+	 * 删除缴费详情
+	 * @param musicGroupPaymentCalenderIds
+	 */
+	void batchDel(String musicGroupPaymentCalenderIds);
+
+	/**
+	 * 删除未缴费的明细
+	 * @param userId
+	 * @param musicGroupId
+	 */
+	void deleteByUserIdAndMusicGroupId(@Param("userId") Integer userId, @Param("musicGroupId") String musicGroupId);
+
+	/**
+	 * 根据缴费记录删除缴费详情
+	 * @param id
+	 */
+    void deleteByCalenderId(@Param("id") Long id);
+
+	/**
+	 * 获取缴费详情学员列表
+	 * @param calenderId
+	 * @return
+	 */
+	Set<Integer> queryStudentIds(Long calenderId);
+
+	/**
+	 * 查询进行中的缴费
+	 * @param musicGroupId
+	 * @param userId
+	 * @return
+	 */
+    Integer countOpenPayment(@Param("musicGroupId") String musicGroupId, @Param("userId") Integer userId);
+}

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

@@ -5,9 +5,13 @@ import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Set;
 
 public interface MusicGroupPurchaseListDao extends BaseDAO<Integer, MusicGroupPurchaseList> {
 
 
     int batchInsert(@Param("musicGroupPurchaseLists") List<MusicGroupPurchaseList> MusicGroupPurchaseLists);
+
+
+    List<MusicGroupPurchaseList> getCount(@Param("musicGroupIds") Set<String> musicGroupIds);
 }

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

@@ -1,15 +1,17 @@
 package com.ym.mec.biz.dal.dao;
 
-import com.ym.mec.biz.dal.dto.UpdateStudentFeeDto;
-import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
-import com.ym.mec.common.dal.BaseDAO;
-import org.apache.ibatis.annotations.Param;
-
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
+
+import com.ym.mec.biz.dal.dto.FeeStudentDto;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail;
+import org.apache.ibatis.annotations.Param;
+
+import com.ym.mec.biz.dal.dto.UpdateStudentFeeDto;
+import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
+import com.ym.mec.common.dal.BaseDAO;
 
 public interface MusicGroupStudentFeeDao extends BaseDAO<Long, MusicGroupStudentFee> {
 
@@ -141,7 +143,7 @@ public interface MusicGroupStudentFeeDao extends BaseDAO<Long, MusicGroupStudent
 	 * @param musicGroupId
 	 * @return
 	 */
-	List<MusicGroupStudentFee> queryByMusicGroupId(String musicGroupId);
+	List<MusicGroupStudentFee> queryByMusicGroupId(@Param("musicGroupId") String musicGroupId, @Param("studentIds") String studentIds);
 
 	/**
 	 * 修改学员缴费周期锁定状态
@@ -168,4 +170,43 @@ public interface MusicGroupStudentFeeDao extends BaseDAO<Long, MusicGroupStudent
 	 * @param musicGroupId
 	 */
 	void updateCalender(@Param("userId") Integer userId, @Param("musicGroupId") String musicGroupId);
+
+	/**
+	 * 修改课程费用
+	 * @param ids
+	 * @param courseFee
+	 */
+    void batchUpdateCourseFee(@Param("ids") String ids, @Param("courseFee") BigDecimal courseFee);
+
+	/**
+	 * 将乐团的学生缴费状态设置为未缴费
+	 * @param calenderDetails
+	 */
+	void setNoPayment(@Param("calenderDetails") List<MusicGroupPaymentCalenderDetail> calenderDetails);
+
+	/**
+	 * 修改为缴费完成
+	 * @param calenderDetails
+	 */
+	void setPaidCompleted(@Param("calenderDetails") List<MusicGroupPaymentCalenderDetail> calenderDetails);
+
+	/**
+	 * 剩余网管课课次加一
+	 * @param musicGroupPaymentCalenderDetailIds
+	 */
+	void remainNetworkClassTimesAdd(@Param("musicGroupPaymentCalenderDetailIds") String musicGroupPaymentCalenderDetailIds);
+
+	/**
+	 * 获取fee表学员列表
+	 * @param musicGroupId
+	 * @return
+	 */
+    List<FeeStudentDto> queryFeeStudents(@Param("musicGroupId") String musicGroupId, @Param("search") String search, @Param("subjectId") Integer subjectId);
+
+	/**
+	 * 根据缴费项目修改缴费状态
+	 * @param calenderId
+	 * @param paymentStatus
+	 */
+	void updatePaymentStatus(@Param("calenderId") Long calenderId, @Param("paymentStatus") String paymentStatus);
 }

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

@@ -17,6 +17,8 @@ public interface OrganizationDao extends BaseDAO<Integer, Organization> {
      */
     List<Organization> findByParentId(@Param("parentId") Integer parentId, @Param("delFlag") String delFlag);
 
+    List<Organization> findOrgans(@Param("organIds") List<Integer> organIds);
+
     /**
      * 根据分部id字符串查询
      * @param organIds

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

@@ -323,4 +323,32 @@ public interface PracticeGroupDao extends com.ym.mec.common.dal.BaseDAO<Long, Pr
      */
     int countStudentAndTeacherTrialPractices(@Param("studentId") Integer studentId,
                                              @Param("teacherId") Integer teacherId);
+
+    /**
+     * @describe 获取需要提醒续费网管课的用户列表
+     * @author Joburgess
+     * @date 2020.05.29
+     * @return java.util.List<com.ym.mec.biz.dal.entity.PracticeGroup>
+     */
+    List<Integer> getNeedRemindPracticeUsers();
+
+    /**
+     * @describe 获取用户和需要提醒的网管课map
+     * @author Joburgess
+     * @date 2020.05.29
+     * @param studentIds:
+     * @return java.util.List<java.util.Map<java.lang.Integer,java.lang.String>>
+     */
+    List<Map<Integer, String>> getUserNeedRemindPracticeIdMap(@Param("studentIds") List<Integer> studentIds);
+
+    /**
+     * @describe 批量修改网管课续费提醒状态
+     * @author Joburgess
+     * @date 2020.05.29
+     * @param practiceIds:
+     * @param remindStatus:
+     * @return int
+     */
+    int batchUpdatePracticeRemindStatus(@Param("practiceIds") List<Integer> practiceIds,
+                                        @Param("remindStatus") Integer remindStatus);
 }

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.dao;
 import com.ym.mec.biz.dal.dto.CourseHomeworkStudentDetailDto;
 import com.ym.mec.biz.dal.dto.StudentCourseHomeworkDto;
 import com.ym.mec.biz.dal.dto.StudentHomeworkRecordDto;
+import com.ym.mec.biz.dal.dto.StudentServeCourseHomeworkDto;
 import com.ym.mec.biz.dal.entity.StudentCourseHomework;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
@@ -10,6 +11,7 @@ import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public interface StudentCourseHomeworkDao extends BaseDAO<Long, StudentCourseHomework> {
 
@@ -108,4 +110,28 @@ public interface StudentCourseHomeworkDao extends BaseDAO<Long, StudentCourseHom
 
     int countStudentHomeworkRecord(Map<String, Object> params);
     List<StudentHomeworkRecordDto> findStudentHomeworkRecord(Map<String, Object> params);
+
+    /**
+     * @describe 根据上课时间区间获取学员课堂作业
+     * @author Joburgess
+     * @date 2020.05.27
+     * @param startDate:
+     * @param endDate:
+     * @return java.util.List<com.ym.mec.biz.dal.dto.StudentServeCourseHomeworkDto>
+     */
+    List<StudentServeCourseHomeworkDto> findStudentHomeworkWithCourseDateRange(@Param("startDate") String startDate,
+                                                                               @Param("endDate") String endDate,
+                                                                               @Param("studentIds") List<Integer> studentIds);
+
+    /**
+     * @describe
+     * @date 2020.06.15
+     * @param startDate:
+     * @param endDate:
+     * @param studentIds:
+     * @return java.util.Set<java.lang.Integer>
+     */
+    Set<Integer> checkStudentHaveHomeworkInDateRange(@Param("startDate") String startDate,
+                                                     @Param("endDate") String endDate,
+                                                     @Param("studentIds") List<Integer> studentIds);
 }

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

@@ -2,10 +2,13 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.Student4operating;
+import com.ym.mec.biz.dal.dto.StudentServeCourseDto;
+import com.ym.mec.biz.dal.dto.StudentServeDto;
 import com.ym.mec.biz.dal.entity.Student;
 import com.ym.mec.biz.dal.enums.GroupType;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -13,6 +16,7 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
 
     int lockUser(@Param("userId") Integer userId);
 
+    SysUser lockUserReturnInfo(@Param("userId") Integer userId);
 
     List<SysUser> findStudents(Map<String, Object> params);
 
@@ -69,4 +73,65 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
      */
 
     List<Student> getServiceStudents();
+
+    /**
+     * @describe 获取被服务学员id列表
+     * @author Joburgess
+     * @date 2020.06.04
+     * @return java.util.List<java.lang.Integer>
+     */
+    List<Integer> getServeStudentIds();
+
+    List<StudentServeCourseDto> getServeStudentCourseStartTimes(@Param("monday") String monday);
+
+    /**
+     * @describe 查询被服务学员信息
+     * @author Joburgess
+     * @date 2020.05.27
+     * @param monday:
+     * @return java.util.List<com.ym.mec.biz.dal.dto.StudentServeDto>
+     */
+    List<StudentServeDto> getBeServiceStudents(@Param("monday") String monday,
+                                               @Param("courseExpireDate")Date courseExpireDate);
+
+
+    List<StudentServeDto> getBeServiceStudentsInfoWithStudents(@Param("monday") String monday,
+                                               @Param("courseExpireDate")Date courseExpireDate,
+                                               @Param("studentIds") List<Integer> studentIds);
+
+    List<StudentServeDto> getBeServiceStudentsInfoWithStudentsForHistory(@Param("monday") String monday,
+                                                               @Param("courseExpireDate")Date courseExpireDate,
+                                                               @Param("studentIds") List<Integer> studentIds);
+
+    /**
+     * @describe 更新指定学员的服务指标或运营指标
+     * @author Joburgess
+     * @date 2020.05.28
+     * @param studentId: 学生编号
+     * @param serviceTag: 服务指标
+     * @param operatingTag: 运营指标
+     * @return int
+     */
+    int updateStudentServiceOrOperatingTag(@Param("studentId") Integer studentId,
+                                           @Param("studentIds") List<Integer> studentIds,
+                                           @Param("serviceTag") Integer serviceTag,
+                                           @Param("operatingTag") Integer operatingTag);
+
+    /**
+     * @describe 更新指定学员的服务指标
+     * @author Joburgess
+     * @date 2020.05.28
+     * @param studentId: 学生编号
+     * @param serviceTag: 服务指标
+     * @return int
+     */
+    int updateStudentServiceTag(@Param("studentId") Integer studentId,
+                                           @Param("studentIds") List<Integer> studentIds,
+                                           @Param("serviceTag") Integer serviceTag);
+
+    /**
+     * 修改学员的指导老师
+     * @param teacherId
+     */
+    void batchUpdateAdviser(@Param("teacherId") Integer teacherId, @Param("studentIds") String studentIds);
 }

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

@@ -29,6 +29,15 @@ public interface StudentExtracurricularExercisesSituationDao extends BaseDAO<Lon
      */
     int deleteByMonday(@Param("monday") String monday);
 
+    /**
+     * @describe 删除指定学员的服务指标
+     * @author Joburgess
+     * @date 2020.05.28
+     * @param studentId: 学员编号
+     * @return int
+     */
+    int deleteByStudent(@Param("studentId") Integer studentId);
+
     List<StudentExercisesSituationDto> findExercisesSituations(Map<String, Object> params);
     int countExercisesSituations(Map<String, Object> params);
 
@@ -64,5 +73,14 @@ public interface StudentExtracurricularExercisesSituationDao extends BaseDAO<Lon
      */
     StudentExtracurricularExercisesSituation findStudentExercisesSituationsWithMonDay(@Param("monday") String monday,
                                                                           @Param("studentId") Integer studentId);
-	
+
+    /**
+     * @describe 获取还需布置课外训练的老师，及布置学生数量
+     * @author Joburgess
+     * @date 2020.06.03
+     * @param monday:
+     * @return java.util.List<java.util.Map<java.lang.Integer,java.lang.Long>>
+     */
+    List<Map<Integer, Long>> getNoFinishedServiceTeacher(@Param("monday") String monday);
+
 }

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

@@ -280,4 +280,19 @@ public interface StudentManageDao {
      * @return
      */
     List<Map<Integer,Integer>> querySubjectNames(@Param("userIds") Set<Integer> userIds);
+
+    /**
+     * 乐团修改--学员缴费记录--可新增学员列表
+     * @param musicGroupId
+     * @param musicGroupPaymentCalenderId
+     * @return
+     */
+    List<BasicUserDto> queryCanAddStudent(@Param("musicGroupId") String musicGroupId, @Param("musicGroupPaymentCalenderId") Long musicGroupPaymentCalenderId);
+
+    /**
+     * 学员是否有课
+     * @param userIds
+     * @return
+     */
+    List<Map<Integer,Integer>> queryHasCourseMap(@Param("userIds") Set<Integer> userIds);
 }

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

@@ -37,4 +37,17 @@ public interface StudentPauseInfoDao extends BaseDAO<Long, StudentPauseInfo> {
     List<StudentPauseInfo> findByGroup(@Param("groupType") GroupType groupType,
                                        @Param("groupId") String groupId);
 
+    /**
+     * @describe 删除学员在指定课程组下的休学信息
+     * @author Joburgess
+     * @date 2020.06.04
+     * @param groupType:
+     * @param groupId:
+     * @param userId:
+     * @return int
+     */
+    int deleteUserPauseInfoWithGroup(@Param("groupType") GroupType groupType,
+                                     @Param("groupId") String groupId,
+                                     @Param("userId") Integer userId);
+
 }

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

@@ -267,8 +267,42 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
 
     /**
      * 统计充值金额
+     *
      * @param params
      * @return
      */
     BigDecimal getChargeAmount(Map<String, Object> params);
+
+    /**
+     * 统计商户当月收款金额
+     *
+     * @param merNo
+     * @param firstDate
+     * @return
+     */
+    BigDecimal sumAccountAmount(@Param("merNo") String merNo, @Param("firstDate") Date firstDate);
+
+    /**
+     * @param groupId:
+     * @param groupType:
+     * @return int
+     * @describe 统计课程组非失败订单数量
+     * @author Joburgess
+     * @date 2020.06.22
+     */
+    int countGroupOrderWithoutFailed(@Param("groupId") String groupId,
+                                     @Param("groupType") GroupType groupType);
+
+    /**
+     * 统计
+     *
+     * @param sporadicId
+     * @return
+     */
+    Integer countSporadicOrder(Integer sporadicId);
+
+    /*
+
+     */
+    Integer findOrganPayOrderNum(@Param("organId") Integer organId);
 }

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

@@ -0,0 +1,44 @@
+package com.ym.mec.biz.dal.dao;
+
+
+import com.ym.mec.biz.dal.dto.StudentPaymentRouteOrderDto;
+import com.ym.mec.biz.dal.entity.StudentPaymentRouteOrder;
+import com.ym.mec.biz.dal.enums.PaymentChannelEnum;
+import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+public interface StudentPaymentRouteOrderDao extends BaseDAO<Long, StudentPaymentRouteOrder> {
+
+    List<StudentPaymentRouteOrderDto> queryPageOrder(Map<String, Object> params);
+
+    StudentPaymentRouteOrderDto getOrderMoneyAmount(Map<String, Object> params);
+
+    /**
+     * 统计充值金额
+     *
+     * @param params
+     * @return
+     */
+    BigDecimal getChargeAmount(Map<String, Object> params);
+
+    int batchAdd(@Param("routeOrders") List<StudentPaymentRouteOrder> routeOrders);
+
+    List<StudentPaymentRouteOrder> getRouteOrders(@Param("orderNo") String orderNo);
+
+    /**
+     * 获取分部分润金额
+     *
+     * @param routeOrganId
+     * @param paymentChannelEnumList
+     * @return
+     */
+    BigDecimal getRouteOrderAmount(@Param("routeOrganId") Integer routeOrganId,
+                                   @Param("paymentChannelEnumList") List<PaymentChannelEnum> paymentChannelEnumList,
+                                   @Param("startTime") Date startTime
+    );
+}

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

@@ -4,13 +4,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.ym.mec.biz.dal.dto.*;
+import com.ym.mec.biz.dal.entity.Subject;
 import org.apache.ibatis.annotations.Param;
 
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dto.StudentApplyDetailDto;
-import com.ym.mec.biz.dal.dto.StudentFeeDetailDto;
-import com.ym.mec.biz.dal.dto.StudentInfo;
-import com.ym.mec.biz.dal.dto.StudentRegisterPerDto;
 import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
 import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
@@ -320,4 +318,18 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
     List<String> queryStudentMusicGroup(Integer studentId);
 
     String getSubjectIds(Integer userId);
+
+    /**
+     * 获取乐团下所有学员身上的声部列表
+     * @param musicGroupId
+     * @return
+     */
+    List<Subject> findMusicGroupAllStudentSubjects(@Param("musicGroupId") String musicGroupId);
+
+    /**
+     * 获取学员详情页，包含所在乐团信息
+     * @param studentId
+     * @return
+     */
+    StudentMusicDetailDto getStudentDetail(Integer studentId);
 }

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

@@ -33,8 +33,14 @@ public interface SysAccountDao extends BaseDAO<Integer, SysAccount> {
 
     /**
      * 获取所有私有账户
+     *
      * @param channel
      * @return
      */
     List<SysAccount> getPerAccount(@Param("channel") String channel);
+
+
+    SysAccount getAdaAccount(@Param("organId") Integer organId, @Param("channel") String channel);
+
+
 }

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

@@ -1,9 +1,16 @@
 package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.SysPaymentConfig;
+import com.ym.mec.biz.dal.enums.PaymentChannelEnum;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface SysPaymentConfigDao extends BaseDAO<Integer, SysPaymentConfig> {
     SysPaymentConfig findPaymentConfigByOrganId(@Param("organId") Integer organId);
+
+    List<SysPaymentConfig> findPaymentConfigByOrganIds(@Param("organIds") List<Integer> organIds);
+
+    List<SysPaymentConfig> getPaymentConfigs(@Param("payType") PaymentChannelEnum payType);
 }

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

@@ -29,4 +29,12 @@ public interface SysUserCashAccountDetailDao extends BaseDAO<Long, SysUserCashAc
      * @return
      */
     Integer countByTypeAndTime(@Param("currentMonth") String currentMonth,@Param("teacherId")Integer teacherId,@Param("activeId")Integer activeId);
+
+    /**
+     * 流水明细查询-包含账户余额与课程余额
+     * @param params
+     * @return
+     */
+    List<SysUserCashAccountDetail> queryAccountDetail(Map<String, Object> params);
+    int countAccountDetails(Map<String, Object> params);
 }

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

@@ -1,8 +1,6 @@
 package com.ym.mec.biz.dal.dao;
 
-import com.ym.mec.biz.dal.dto.Mapper;
-import com.ym.mec.biz.dal.dto.TeacherAbnormalAttendanceInfoDto;
-import com.ym.mec.biz.dal.dto.TeacherPersonalAttendanceDto;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.TeacherAttendance;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.common.dal.BaseDAO;
@@ -22,6 +20,13 @@ public interface TeacherAttendanceDao extends BaseDAO<Long, TeacherAttendance> {
      */
     List<TeacherPersonalAttendanceDto> getTeacherPersonalAttendances(Map<String,Object> params);
 
+    /**
+     * 获取教师签到列表
+     * @param params
+     * @return
+     */
+    List<TeacherAttendancesDto> queryTeacherAttendances(Map<String,Object> params);
+
     int batchInsert(@Param("teacherAttendances") List<TeacherAttendance> teacherAttendances);
 
     int batchDeleteByCourseSchedules(@Param("courseScheduleIds") List<Long> courseScheduleIds);
@@ -37,6 +42,13 @@ public interface TeacherAttendanceDao extends BaseDAO<Long, TeacherAttendance> {
     int getTeacherPersonalAttendancesCount(Map<String,Object> params);
 
     /**
+     * 获取教师签到列表
+     * @param params
+     * @return
+     */
+    int countTeacherAttendances(Map<String,Object> params);
+
+    /**
      * @Author: Joburgess
      * @Date: 2019/9/24
      * 统计课次
@@ -197,4 +209,39 @@ public interface TeacherAttendanceDao extends BaseDAO<Long, TeacherAttendance> {
 	 * @param courseId
 	 */
 	void cleanCourseTeacherSignOut(@Param("courseId") Long courseId);
+
+	/**
+	 * 获取当天有异常考勤的老师列表
+	 * @param format
+	 * @return
+	 */
+    Set<Integer> queryTeacherExceptionAttendance(String format);
+
+	/**
+	 * 获取教师课时申述列表
+	 * @param params
+	 * @return
+	 */
+	List<TeacherAttendanceComplaintsDto> queryTeacherAttendanceComplaints(Map<String, Object> params);
+
+	/**
+	 * COUNT教师课时申述列表
+	 * @param params
+	 * @return
+	 */
+	int countTeacherAttendanceComplaints(Map<String, Object> params);
+
+	/**
+	 * 删除老师考勤
+	 * @param courseScheduleIds
+	 * @param teacherId
+	 */
+	void deleteByCourseAndTeacherId(@Param("courseScheduleIds") Set<Long> courseScheduleIds, @Param("teacherId") Integer teacherId);
+
+	/**
+	 * 获取上课时间
+	 * @param courseScheduleId
+	 * @return
+	 */
+    Integer getAttendClassTime(Integer courseScheduleId);
 }

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

@@ -6,6 +6,7 @@ import com.ym.mec.biz.dal.entity.CourseHomework;
 import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImUserModel;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
@@ -14,6 +15,8 @@ import java.util.Map;
 import java.util.Set;
 
 public interface TeacherDao extends BaseDAO<Integer, Teacher> {
+	
+	Teacher getLocked(Integer id);
 
     /**
      * 根据证件号查询老师
@@ -123,6 +126,9 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
     List<ExtendTeacherBasicDto> findTeaTeachersByOrganAndSubject2(@Param("organId") Integer organId,
                                                                   @Param("subjectId") Integer subjectId);
 
+    List<ExtendTeacherBasicDto> findTeaTeachersByOrganAndSubject3(@Param("organId") Integer organId,
+                                                                  @Param("subjectId") Integer subjectId);
+
     /**
      * @param organIds:   部门编号列表
      * @param subjectIds: 声部编号列表
@@ -453,4 +459,19 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @return
      */
     List<String> queryMusicLeaderIds(Integer teacherId);
+
+    /**
+     * 获取和当前指导老师关联的学员
+     * @return
+     */
+    List<BasicUserDto> queryStudent(Map<String, Object> params);
+
+    /**
+     * COUNT当前指导老师关联的学员
+     * @param params
+     * @return
+     */
+    int countStudent(Map<String, Object> params);
+    
+    List<TeacherDefaultSalaryDto> queryTeacherDefaultSalary(Integer organId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/AmountChannelDto.java

@@ -0,0 +1,58 @@
+package com.ym.mec.biz.dal.dto;
+
+import java.math.BigDecimal;
+
+public class AmountChannelDto {
+
+    private Integer organId;
+
+    private Integer routeOrganId;
+
+    private String type;
+
+    private BigDecimal amount;
+
+    private String feeFlag;
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(Integer organId) {
+        this.organId = organId;
+    }
+
+
+    public Integer getRouteOrganId() {
+        return routeOrganId;
+    }
+
+    public void setRouteOrganId(Integer routeOrganId) {
+        this.routeOrganId = routeOrganId;
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public String getFeeFlag() {
+        return feeFlag;
+    }
+
+    public void setFeeFlag(String feeFlag) {
+        this.feeFlag = feeFlag;
+    }
+
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ClassGroup4MixDto.java

@@ -51,6 +51,9 @@ public class ClassGroup4MixDto {
     @ApiModelProperty(value = "预计学生人数", required = true)
     private Integer expectStudentNum;
 
+    @ApiModelProperty(value = "声部id", required = true)
+    private Integer subjectId;
+
     public String getMusicGroupId() {
         return musicGroupId;
     }
@@ -162,4 +165,12 @@ public class ClassGroup4MixDto {
     public void setExpectStudentNum(Integer expectStudentNum) {
         this.expectStudentNum = expectStudentNum;
     }
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseScheduleDto.java

@@ -35,10 +35,10 @@ public class CourseScheduleDto extends CourseSchedule {
     @ApiModelProperty(value = "班级编号，房间号",required = false)
     private String sealClassId;
 
-    @ApiModelProperty(value = "签到状态(1已签到，0未签到)",required = false)
+    @ApiModelProperty(value = "签到状态(1正常，0异常,3未签到)",required = false)
     private Integer signInStatus;
 
-    @ApiModelProperty(value = "签退状态(1已签到，0未签到)",required = false)
+    @ApiModelProperty(value = "签退状态(1正常，0异常,3未签到)",required = false)
     private Integer signOutStatus;
 
     @ApiModelProperty(value = "教师角色")
@@ -47,6 +47,7 @@ public class CourseScheduleDto extends CourseSchedule {
     @ApiModelProperty(value = "投诉状态")
     private Integer complaintStatus;
 
+
     private String subjectName;
 
     private String subjectId;
@@ -69,8 +70,68 @@ public class CourseScheduleDto extends CourseSchedule {
 
     private Integer studentId;
 
+    //是否提交过申述0否1是
+    private int isComplaints;
+
+    //申述状态0拒绝1通过2待处理3已撤销
+    private Integer complaintsStatus;
+
+    //申述内容
+    private String complaintsContent;
+
+    //处理结果
+    private String disposeContent;
+
     private int isNew;
 
+    public Integer getSignInStatus() {
+        return signInStatus;
+    }
+
+    public void setSignInStatus(Integer signInStatus) {
+        this.signInStatus = signInStatus;
+    }
+
+    public Integer getSignOutStatus() {
+        return signOutStatus;
+    }
+
+    public void setSignOutStatus(Integer signOutStatus) {
+        this.signOutStatus = signOutStatus;
+    }
+
+    public Integer getComplaintsStatus() {
+        return complaintsStatus;
+    }
+
+    public void setComplaintsStatus(Integer complaintsStatus) {
+        this.complaintsStatus = complaintsStatus;
+    }
+
+    public String getComplaintsContent() {
+        return complaintsContent;
+    }
+
+    public void setComplaintsContent(String complaintsContent) {
+        this.complaintsContent = complaintsContent;
+    }
+
+    public String getDisposeContent() {
+        return disposeContent;
+    }
+
+    public void setDisposeContent(String disposeContent) {
+        this.disposeContent = disposeContent;
+    }
+
+    public int getIsComplaints() {
+        return isComplaints;
+    }
+
+    public void setIsComplaints(int isComplaints) {
+        this.isComplaints = isComplaints;
+    }
+
     public int getIsNew() {
         return isNew;
     }
@@ -103,6 +164,14 @@ public class CourseScheduleDto extends CourseSchedule {
         this.groupName = groupName;
     }
 
+    public Integer getComplaintStatus() {
+        return complaintStatus;
+    }
+
+    public void setComplaintStatus(Integer complaintStatus) {
+        this.complaintStatus = complaintStatus;
+    }
+
     public Integer getExpectStudentNum() {
         return expectStudentNum;
     }
@@ -135,14 +204,6 @@ public class CourseScheduleDto extends CourseSchedule {
         this.subjectName = subjectName;
     }
 
-    public Integer getComplaintStatus() {
-        return complaintStatus;
-    }
-
-    public void setComplaintStatus(Integer complaintStatus) {
-        this.complaintStatus = complaintStatus;
-    }
-
     public TeachTypeEnum getTeacherRole() {
         return teacherRole;
     }
@@ -167,22 +228,6 @@ public class CourseScheduleDto extends CourseSchedule {
         this.totalStudentNum = totalStudentNum;
     }
 
-    public Integer getSignInStatus() {
-        return signInStatus;
-    }
-
-    public void setSignInStatus(Integer signInStatus) {
-        this.signInStatus = signInStatus;
-    }
-
-    public Integer getSignOutStatus() {
-        return signOutStatus;
-    }
-
-    public void setSignOutStatus(Integer signOutStatus) {
-        this.signOutStatus = signOutStatus;
-    }
-
     public String getSealClassId() {
         return sealClassId;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseTeacherSalaryStatisticsDto.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.enums.GroupType;
+import com.ym.mec.biz.dal.enums.TeacherSalaryConfirmStatus;
 
 import java.math.BigDecimal;
 
@@ -22,6 +23,16 @@ public class CourseTeacherSalaryStatisticsDto {
 
     private BigDecimal totalReduceSalary;
 
+    private TeacherSalaryConfirmStatus confirmStatus;
+
+    public TeacherSalaryConfirmStatus getConfirmStatus() {
+        return confirmStatus;
+    }
+
+    public void setConfirmStatus(TeacherSalaryConfirmStatus confirmStatus) {
+        this.confirmStatus = confirmStatus;
+    }
+
     public String getStatType() {
         return statType;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/FeeStudentDto.java

@@ -0,0 +1,75 @@
+package com.ym.mec.biz.dal.dto;
+
+import java.math.BigDecimal;
+
+public class FeeStudentDto {
+    private Integer id;
+
+    private Integer userId;
+
+    private String username;
+
+    private Integer gender;
+
+    private String subjectName;
+
+    private BigDecimal courseFee;
+
+    private String musicGroupId;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public Integer getGender() {
+        return gender;
+    }
+
+    public void setGender(Integer gender) {
+        this.gender = gender;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
+    public BigDecimal getCourseFee() {
+        return courseFee;
+    }
+
+    public void setCourseFee(BigDecimal courseFee) {
+        this.courseFee = courseFee;
+    }
+
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public void setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/HfMemberDto.java

@@ -0,0 +1,71 @@
+package com.ym.mec.biz.dal.dto;
+
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.web.multipart.MultipartFile;
+
+public class HfMemberDto {
+    //商户号
+    private String memberId;
+    //公司名称
+    private String name;
+    //省份编号
+    private String provCode;
+    //城市编号
+    private String areaCode;
+    //统一社会信用码
+    private String socialCreditCode;
+    //统一社会信用码有效期
+    private String socialCreditCodeExpires;
+    //经营范围
+    private String businessScope;
+    //法人
+    private String legalPerson;
+    //法人身份证号
+    private String legalCertId;
+    //身份证有效期
+    private String legalCertIdExpires;
+    //法人手机号
+    private String legalMp;
+    //公司地址
+    private String address;
+    //邮编
+    private String zipCode;
+    //银行卡号
+    private String cardNo;
+    //银行编码
+    private String bankCode;
+    //文件
+    private MultipartFile path;
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getProvCode() {
+        return provCode;
+    }
+
+    public void setProvCode(String provCode) {
+        this.provCode = provCode;
+    }
+
+    public String getAreaCode() {
+        return areaCode;
+    }
+
+    public void setAreaCode(String areaCode) {
+        this.areaCode = areaCode;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupRegisterDto.java

@@ -0,0 +1,90 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public class MusicGroupRegisterDto {
+    private String organName;
+
+    private String musicGroupId;
+
+    private String musicGroupName;
+
+    private MusicGroupStatusEnum musicGroupStatus;
+
+    private Integer registerNum=0;
+
+    private Integer GroupBuyMusicalNum = 0;
+
+    private Integer registerPayNum = 0;
+
+    private BigDecimal totalMoney = BigDecimal.ZERO;
+
+    public String getOrganName() {
+        return organName;
+    }
+
+    public void setOrganName(String organName) {
+        this.organName = organName;
+    }
+
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public void setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+    }
+
+    public String getMusicGroupName() {
+        return musicGroupName;
+    }
+
+    public void setMusicGroupName(String musicGroupName) {
+        this.musicGroupName = musicGroupName;
+    }
+
+    public MusicGroupStatusEnum getMusicGroupStatus() {
+        return musicGroupStatus;
+    }
+
+    public void setMusicGroupStatus(MusicGroupStatusEnum musicGroupStatus) {
+        this.musicGroupStatus = musicGroupStatus;
+    }
+
+    public Integer getRegisterNum() {
+        return registerNum;
+    }
+
+    public void setRegisterNum(Integer registerNum) {
+        this.registerNum = registerNum;
+    }
+
+
+    public Integer getGroupBuyMusicalNum() {
+        return GroupBuyMusicalNum;
+    }
+
+    public void setGroupBuyMusicalNum(Integer groupBuyMusicalNum) {
+        GroupBuyMusicalNum = groupBuyMusicalNum;
+    }
+
+    public Integer getRegisterPayNum() {
+        return registerPayNum;
+    }
+
+    public void setRegisterPayNum(Integer registerPayNum) {
+        this.registerPayNum = registerPayNum;
+    }
+
+    public BigDecimal getTotalMoney() {
+        return totalMoney;
+    }
+
+    public void setTotalMoney(BigDecimal totalMoney) {
+        this.totalMoney = totalMoney;
+    }
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupStudentsDto.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
@@ -40,8 +41,7 @@ public class MusicGroupStudentsDto{
     @ApiModelProperty(value = "学员状态 NORMAL(NORMAL, 在读), LEAVE(LEAVE, 请假), QUIT(QUIT, 退班)",required = false)
     private String studentStatus;
 
-    @ApiModelProperty(value = "缴费状态  PAID_COMPLETED(完成缴费), NON_PAYMENT(未缴费), PROCESSING(缴费中)",required = false)
-    private String paymentStatus;
+    private PaymentStatusEnum paymentStatus;
 
     @ApiModelProperty(value = "是否新增学员（1是0否）",required = false)
     private Integer isNewStudent;
@@ -170,11 +170,11 @@ public class MusicGroupStudentsDto{
         this.studentStatus = studentStatus;
     }
 
-    public String getPaymentStatus() {
+    public PaymentStatusEnum getPaymentStatus() {
         return paymentStatus;
     }
 
-    public void setPaymentStatus(String paymentStatus) {
+    public void setPaymentStatus(PaymentStatusEnum paymentStatus) {
         this.paymentStatus = paymentStatus;
     }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/OnlineMusicGroupCourseDto.java

@@ -0,0 +1,68 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.CourseGenerateDto;
+
+import java.util.Date;
+
+public class OnlineMusicGroupCourseDto extends CourseGenerateDto {
+
+    private String musicGroupId;
+
+    private Integer studentId;
+
+    private Integer subjectId;
+
+    private Integer teacherId;
+
+    private Date firstCourseTime;
+
+    private boolean skipHoliday;
+
+    public boolean isSkipHoliday() {
+        return skipHoliday;
+    }
+
+    public void setSkipHoliday(boolean skipHoliday) {
+        this.skipHoliday = skipHoliday;
+    }
+
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public void setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+    }
+
+    public Integer getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Integer studentId) {
+        this.studentId = studentId;
+    }
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public Integer getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Integer teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public Date getFirstCourseTime() {
+        return firstCourseTime;
+    }
+
+    public void setFirstCourseTime(Date firstCourseTime) {
+        this.firstCourseTime = firstCourseTime;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/PageInfoDegree.java

@@ -0,0 +1,53 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.common.page.PageInfo;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+public class PageInfoDegree<T> extends PageInfo<T> {
+
+    @ApiModelProperty(value = "考级费用总额", required = true)
+    private BigDecimal subjectLevelAmount =BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "乐理考级总额", required = true)
+    private BigDecimal theoryLevelAmount =BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "考级总金额", required = true)
+    private BigDecimal totalAmount = BigDecimal.ZERO;
+
+    public PageInfoDegree() {
+    }
+
+    public PageInfoDegree(Integer pageNo) {
+        super(pageNo);
+    }
+
+    public PageInfoDegree(Integer pageNo, int pageSize) {
+        super(pageNo, pageSize);
+    }
+
+    public BigDecimal getSubjectLevelAmount() {
+        return subjectLevelAmount;
+    }
+
+    public void setSubjectLevelAmount(BigDecimal subjectLevelAmount) {
+        this.subjectLevelAmount = subjectLevelAmount;
+    }
+
+    public BigDecimal getTheoryLevelAmount() {
+        return theoryLevelAmount;
+    }
+
+    public void setTheoryLevelAmount(BigDecimal theoryLevelAmount) {
+        this.theoryLevelAmount = theoryLevelAmount;
+    }
+
+    public BigDecimal getTotalAmount() {
+        return totalAmount;
+    }
+
+    public void setTotalAmount(BigDecimal totalAmount) {
+        this.totalAmount = totalAmount;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/PracticeGroupDto.java

@@ -28,8 +28,18 @@ public class PracticeGroupDto extends PracticeGroup {
 
     private Integer evaluateStatus;
 
+    private Integer hasRestClass;
+
     private String educationalTeacherName;
 
+    public Integer getHasRestClass() {
+        return hasRestClass;
+    }
+
+    public void setHasRestClass(Integer hasRestClass) {
+        this.hasRestClass = hasRestClass;
+    }
+
     public String getEducationalTeacherName() {
         return educationalTeacherName;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/RegisterSubjectDto.java

@@ -0,0 +1,44 @@
+package com.ym.mec.biz.dal.dto;
+
+public class RegisterSubjectDto {
+
+    private String musicGroupId;
+
+    private Integer subjectId;
+
+    private String subjectName;
+
+    private Integer num = 0;
+
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public void setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+    }
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
+    public Integer getNum() {
+        return num;
+    }
+
+    public void setNum(Integer num) {
+        this.num = num;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/RongyunBasicUserDto.java

@@ -0,0 +1,33 @@
+package com.ym.mec.biz.dal.dto;
+
+public class RongyunBasicUserDto {
+    private Integer userId;
+
+    private String userName;
+
+    private String headUrl;
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getHeadUrl() {
+        return headUrl;
+    }
+
+    public void setHeadUrl(String headUrl) {
+        this.headUrl = headUrl;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/RouteScaleDto.java

@@ -0,0 +1,69 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.enums.PaymentChannelEnum;
+
+import java.math.BigDecimal;
+
+public class RouteScaleDto {
+
+    private Integer organId;
+
+    private PaymentChannelEnum payType;
+
+    private Integer scale;
+
+    private String merNo;
+
+    private BigDecimal amount = BigDecimal.ONE;
+
+    private String feeFlag;
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(Integer organId) {
+        this.organId = organId;
+    }
+
+    public String getMerNo() {
+        return merNo;
+    }
+
+    public void setMerNo(String merNo) {
+        this.merNo = merNo;
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public String getFeeFlag() {
+        return feeFlag;
+    }
+
+    public void setFeeFlag(String feeFlag) {
+        this.feeFlag = feeFlag;
+    }
+
+
+    public Integer getScale() {
+        return scale;
+    }
+
+    public void setScale(Integer scale) {
+        this.scale = scale;
+    }
+
+    public PaymentChannelEnum getPayType() {
+        return payType;
+    }
+
+    public void setPayType(PaymentChannelEnum payType) {
+        this.payType = payType;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/Student4operating.java

@@ -14,11 +14,13 @@ public class Student4operating {
     private Integer vipTimes;
     private Integer freePracticeTimes;
     private Integer buyPracticeTimes;
+    private Integer musicNetWorkTimes;
 
     private String operatingTagStr;
     private String vipTimesStr;
     private String freePracticeTimesStr;
     private String buyPracticeTimesStr;
+    private String musicNetWorkTimesStr;
     private Integer studentNum;
 
     public String getOrganName() {
@@ -145,4 +147,20 @@ public class Student4operating {
 	public void setStudentNum(Integer studentNum) {
 		this.studentNum = studentNum;
 	}
+
+    public Integer getMusicNetWorkTimes() {
+        return musicNetWorkTimes;
+    }
+
+    public void setMusicNetWorkTimes(Integer musicNetWorkTimes) {
+        this.musicNetWorkTimes = musicNetWorkTimes;
+    }
+
+    public String getMusicNetWorkTimesStr() {
+        return musicNetWorkTimesStr;
+    }
+
+    public void setMusicNetWorkTimesStr(String musicNetWorkTimesStr) {
+        this.musicNetWorkTimesStr = musicNetWorkTimesStr;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentEduTeacherDto.java

@@ -0,0 +1,46 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.enums.GroupType;
+
+public class StudentEduTeacherDto {
+
+    private Integer studentId;
+
+    private Integer educationalTeacherId;
+
+    private String educationalTeacherName;
+
+    private String groupType;
+
+    public String getGroupType() {
+        return groupType;
+    }
+
+    public void setGroupType(String groupType) {
+        this.groupType = groupType;
+    }
+
+    public Integer getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Integer studentId) {
+        this.studentId = studentId;
+    }
+
+    public Integer getEducationalTeacherId() {
+        return educationalTeacherId;
+    }
+
+    public void setEducationalTeacherId(Integer educationalTeacherId) {
+        this.educationalTeacherId = educationalTeacherId;
+    }
+
+    public String getEducationalTeacherName() {
+        return educationalTeacherName;
+    }
+
+    public void setEducationalTeacherName(String educationalTeacherName) {
+        this.educationalTeacherName = educationalTeacherName;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentExercisesSituationDto.java

@@ -18,6 +18,26 @@ public class StudentExercisesSituationDto extends StudentExtracurricularExercise
 
     private Integer existPracticeCourse;
 
+    private Integer educationalTeacherId;
+
+    private String educationalTeacherName;
+
+    public Integer getEducationalTeacherId() {
+        return educationalTeacherId;
+    }
+
+    public void setEducationalTeacherId(Integer educationalTeacherId) {
+        this.educationalTeacherId = educationalTeacherId;
+    }
+
+    public String getEducationalTeacherName() {
+        return educationalTeacherName;
+    }
+
+    public void setEducationalTeacherName(String educationalTeacherName) {
+        this.educationalTeacherName = educationalTeacherName;
+    }
+
     public Integer getExistPracticeCourse() {
         return existPracticeCourse;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentManageListDto.java

@@ -44,6 +44,9 @@ public class StudentManageListDto {
 
     @ApiModelProperty(value = "课程余额")
     private BigDecimal courseBalance;
+
+    @ApiModelProperty(value = "账户余额")
+    private BigDecimal balance;
     
     private YesOrNoEnum isActive;
 
@@ -74,6 +77,14 @@ public class StudentManageListDto {
     
     private Integer teacherId;
 
+    public BigDecimal getBalance() {
+        return balance;
+    }
+
+    public void setBalance(BigDecimal balance) {
+        this.balance = balance;
+    }
+
     public YesOrNoEnum getServiceTag() {
         return serviceTag;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentManageVipGroupClassDto.java

@@ -23,6 +23,10 @@ public class StudentManageVipGroupClassDto {
     private String activeName;
 
     private Date courseStartDate;
+    
+    private Integer eduTeacherId;
+    
+    private String eduTeacherName;
 
     public Integer getCurrentClassTimes() {
         return currentClassTimes;
@@ -103,4 +107,20 @@ public class StudentManageVipGroupClassDto {
     public void setCourseStartDate(Date courseStartDate) {
         this.courseStartDate = courseStartDate;
     }
+
+	public Integer getEduTeacherId() {
+		return eduTeacherId;
+	}
+
+	public void setEduTeacherId(Integer eduTeacherId) {
+		this.eduTeacherId = eduTeacherId;
+	}
+
+	public String getEduTeacherName() {
+		return eduTeacherName;
+	}
+
+	public void setEduTeacherName(String eduTeacherName) {
+		this.eduTeacherName = eduTeacherName;
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentMusicDetailDto.java

@@ -0,0 +1,87 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.MusicGroup;
+
+import java.util.List;
+
+public class StudentMusicDetailDto {
+    private Integer userId;
+
+    private String username;
+
+    private Integer gender;
+
+    private String subjectName;
+
+    private String phone;
+
+    private String avatar;
+
+    private String imToken;
+
+    private List<MusicGroup> musicGroups;
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public Integer getGender() {
+        return gender;
+    }
+
+    public void setGender(Integer gender) {
+        this.gender = gender;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public String getImToken() {
+        return imToken;
+    }
+
+    public void setImToken(String imToken) {
+        this.imToken = imToken;
+    }
+
+    public List<MusicGroup> getMusicGroups() {
+        return musicGroups;
+    }
+
+    public void setMusicGroups(List<MusicGroup> musicGroups) {
+        this.musicGroups = musicGroups;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentPaymentRouteOrderDto.java

@@ -0,0 +1,73 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
+
+import java.math.BigDecimal;
+
+public class StudentPaymentRouteOrderDto extends StudentPaymentOrder {
+
+    /**
+     * 分配分部id
+     */
+    private Integer routeOrganId;
+
+    /**
+     * 分润金额
+     */
+    private BigDecimal routeAmount;
+
+    /**
+     * 分润余额
+     */
+    private BigDecimal routeBalanceAmount;
+
+    /**
+     * 渠道收款账户
+     */
+    private String merNo;
+
+    /**
+     * 备注
+     */
+    private String feeFlag;
+
+    public Integer getRouteOrganId() {
+        return routeOrganId;
+    }
+
+    public void setRouteOrganId(Integer routingOrganId) {
+        this.routeOrganId = routingOrganId;
+    }
+
+    public BigDecimal getRouteAmount() {
+        return routeAmount;
+    }
+
+    public void setRouteAmount(BigDecimal routeAmount) {
+        this.routeAmount = routeAmount;
+    }
+
+    public String getMerNo() {
+        return merNo;
+    }
+
+    public void setMerNo(String merNo) {
+        this.merNo = merNo;
+    }
+
+    public String getFeeFlag() {
+        return feeFlag;
+    }
+
+    public void setFeeFlag(String feeFlag) {
+        this.feeFlag = feeFlag;
+    }
+
+    public BigDecimal getRouteBalanceAmount() {
+        return routeBalanceAmount;
+    }
+
+    public void setRouteBalanceAmount(BigDecimal routeBalanceAmount) {
+        this.routeBalanceAmount = routeBalanceAmount;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentServeCourseDto.java

@@ -0,0 +1,40 @@
+package com.ym.mec.biz.dal.dto;
+
+import java.util.Date;
+
+/**
+ * @Author Joburgess
+ * @Date 2020.06.15
+ */
+public class StudentServeCourseDto {
+
+    private Integer studentId;
+
+    private Date courseStartTime;
+
+    private Date serviceTagUpdateTime;
+
+    public Date getServiceTagUpdateTime() {
+        return serviceTagUpdateTime;
+    }
+
+    public void setServiceTagUpdateTime(Date serviceTagUpdateTime) {
+        this.serviceTagUpdateTime = serviceTagUpdateTime;
+    }
+
+    public Integer getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Integer studentId) {
+        this.studentId = studentId;
+    }
+
+    public Date getCourseStartTime() {
+        return courseStartTime;
+    }
+
+    public void setCourseStartTime(Date courseStartTime) {
+        this.courseStartTime = courseStartTime;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentServeCourseHomeworkDto.java

@@ -0,0 +1,32 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.StudentCourseHomework;
+
+import java.util.Date;
+
+/**
+ * @Author Joburgess
+ * @Date 2020.05.27
+ */
+public class StudentServeCourseHomeworkDto extends StudentCourseHomework {
+
+    private Date courseStartTime;
+
+    private Date homeworkCreateTime;
+
+    public Date getHomeworkCreateTime() {
+        return homeworkCreateTime;
+    }
+
+    public void setHomeworkCreateTime(Date homeworkCreateTime) {
+        this.homeworkCreateTime = homeworkCreateTime;
+    }
+
+    public Date getCourseStartTime() {
+        return courseStartTime;
+    }
+
+    public void setCourseStartTime(Date courseStartTime) {
+        this.courseStartTime = courseStartTime;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentServeDto.java

@@ -0,0 +1,44 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.Student;
+import com.ym.mec.biz.dal.enums.GroupType;
+import com.ym.mec.biz.dal.enums.TeachModeEnum;
+
+import java.util.Date;
+
+/**
+ * @Author Joburgess
+ * @Date 2020.05.27
+ */
+public class StudentServeDto extends Student {
+
+    private GroupType groupType;
+
+    private TeachModeEnum teachMode;
+
+    private Date courseStartTime;
+
+    public GroupType getGroupType() {
+        return groupType;
+    }
+
+    public void setGroupType(GroupType groupType) {
+        this.groupType = groupType;
+    }
+
+    public TeachModeEnum getTeachMode() {
+        return teachMode;
+    }
+
+    public void setTeachMode(TeachModeEnum teachMode) {
+        this.teachMode = teachMode;
+    }
+
+    public Date getCourseStartTime() {
+        return courseStartTime;
+    }
+
+    public void setCourseStartTime(Date courseStartTime) {
+        this.courseStartTime = courseStartTime;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherAttendanceComplaintsDto.java

@@ -0,0 +1,167 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.enums.ComplaintsStatusEnum;
+import com.ym.mec.biz.dal.enums.SignInStatusEnum;
+import com.ym.mec.biz.dal.enums.SignOutStatusEnum;
+
+public class TeacherAttendanceComplaintsDto{
+    private String organName;
+
+    private Long teacherAttendanceId;
+
+    private Long courseScheduleId;
+
+    private String courseScheduleName;
+
+    private String courseScheduleTime;
+
+    private String courseScheduleStartTime;
+
+    private String courseScheduleEndTime;
+
+    private SignInStatusEnum signInStatus;
+
+    private SignOutStatusEnum signOutStatus;
+
+    private String teacherName;
+
+    private ComplaintsStatusEnum complaintsStatusEnum;
+
+    private String operatorName;
+
+    private String signInTime;
+
+    private String signOutTime;
+
+    private String complaintsContent;
+
+    private String disposeContent;
+
+    public Long getTeacherAttendanceId() {
+        return teacherAttendanceId;
+    }
+
+    public void setTeacherAttendanceId(Long teacherAttendanceId) {
+        this.teacherAttendanceId = teacherAttendanceId;
+    }
+
+    public String getCourseScheduleEndTime() {
+        return courseScheduleEndTime;
+    }
+
+    public void setCourseScheduleEndTime(String courseScheduleEndTime) {
+        this.courseScheduleEndTime = courseScheduleEndTime;
+    }
+
+    public String getCourseScheduleStartTime() {
+        return courseScheduleStartTime;
+    }
+
+    public void setCourseScheduleStartTime(String courseScheduleStartTime) {
+        this.courseScheduleStartTime = courseScheduleStartTime;
+    }
+
+    public String getSignInTime() {
+        return signInTime;
+    }
+
+    public void setSignInTime(String signInTime) {
+        this.signInTime = signInTime;
+    }
+
+    public String getSignOutTime() {
+        return signOutTime;
+    }
+
+    public void setSignOutTime(String signOutTime) {
+        this.signOutTime = signOutTime;
+    }
+
+    public String getComplaintsContent() {
+        return complaintsContent;
+    }
+
+    public void setComplaintsContent(String complaintsContent) {
+        this.complaintsContent = complaintsContent;
+    }
+
+    public String getDisposeContent() {
+        return disposeContent;
+    }
+
+    public void setDisposeContent(String disposeContent) {
+        this.disposeContent = disposeContent;
+    }
+
+    public String getOrganName() {
+        return organName;
+    }
+
+    public void setOrganName(String organName) {
+        this.organName = organName;
+    }
+
+    public Long getCourseScheduleId() {
+        return courseScheduleId;
+    }
+
+    public void setCourseScheduleId(Long courseScheduleId) {
+        this.courseScheduleId = courseScheduleId;
+    }
+
+    public String getCourseScheduleName() {
+        return courseScheduleName;
+    }
+
+    public void setCourseScheduleName(String courseScheduleName) {
+        this.courseScheduleName = courseScheduleName;
+    }
+
+    public String getCourseScheduleTime() {
+        return courseScheduleTime;
+    }
+
+    public void setCourseScheduleTime(String courseScheduleTime) {
+        this.courseScheduleTime = courseScheduleTime;
+    }
+
+    public SignInStatusEnum getSignInStatus() {
+        return signInStatus;
+    }
+
+    public void setSignInStatus(SignInStatusEnum signInStatus) {
+        this.signInStatus = signInStatus;
+    }
+
+    public SignOutStatusEnum getSignOutStatus() {
+        return signOutStatus;
+    }
+
+    public void setSignOutStatus(SignOutStatusEnum signOutStatus) {
+        this.signOutStatus = signOutStatus;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
+    public ComplaintsStatusEnum getComplaintsStatusEnum() {
+        return complaintsStatusEnum;
+    }
+
+    public void setComplaintsStatusEnum(ComplaintsStatusEnum complaintsStatusEnum) {
+        this.complaintsStatusEnum = complaintsStatusEnum;
+    }
+
+    public String getOperatorName() {
+        return operatorName;
+    }
+
+    public void setOperatorName(String operatorName) {
+        this.operatorName = operatorName;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherAttendanceDetailDto.java

@@ -0,0 +1,138 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.CourseSchedule;
+import com.ym.mec.biz.dal.enums.*;
+
+import java.util.Date;
+
+public class TeacherAttendanceDetailDto {
+    private String remark;
+
+    private String teacherName;
+
+    private TeachModeEnum teachMode;
+
+    private CourseSchedule.CourseScheduleType type;
+
+    private CourseStatusEnum status;
+
+    private int isSignIn = 3;
+
+    private int isSignOut = 3;
+
+    private SignInStatusEnum signInStatusEnum;
+
+    private SignOutStatusEnum signOutStatusEnum;
+
+    private YesOrNoEnum isCallNames;
+
+    private Date signInTime;
+
+    private Date signOutTime;
+
+    private Integer attendClassTime;
+
+    public Integer getAttendClassTime() {
+        return attendClassTime;
+    }
+
+    public void setAttendClassTime(Integer attendClassTime) {
+        this.attendClassTime = attendClassTime;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
+    public TeachModeEnum getTeachMode() {
+        return teachMode;
+    }
+
+    public void setTeachMode(TeachModeEnum teachMode) {
+        this.teachMode = teachMode;
+    }
+
+    public CourseSchedule.CourseScheduleType getType() {
+        return type;
+    }
+
+    public void setType(CourseSchedule.CourseScheduleType type) {
+        this.type = type;
+    }
+
+    public CourseStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(CourseStatusEnum status) {
+        this.status = status;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public int getIsSignIn() {
+        return isSignIn;
+    }
+
+    public void setIsSignIn(int isSignIn) {
+        this.isSignIn = isSignIn;
+    }
+
+    public int getIsSignOut() {
+        return isSignOut;
+    }
+
+    public void setIsSignOut(int isSignOut) {
+        this.isSignOut = isSignOut;
+    }
+
+    public SignInStatusEnum getSignInStatusEnum() {
+        return signInStatusEnum;
+    }
+
+    public void setSignInStatusEnum(SignInStatusEnum signInStatusEnum) {
+        this.signInStatusEnum = signInStatusEnum;
+    }
+
+    public SignOutStatusEnum getSignOutStatusEnum() {
+        return signOutStatusEnum;
+    }
+
+    public void setSignOutStatusEnum(SignOutStatusEnum signOutStatusEnum) {
+        this.signOutStatusEnum = signOutStatusEnum;
+    }
+
+    public YesOrNoEnum getIsCallNames() {
+        return isCallNames;
+    }
+
+    public void setIsCallNames(YesOrNoEnum isCallNames) {
+        this.isCallNames = isCallNames;
+    }
+
+    public Date getSignInTime() {
+        return signInTime;
+    }
+
+    public void setSignInTime(Date signInTime) {
+        this.signInTime = signInTime;
+    }
+
+    public Date getSignOutTime() {
+        return signOutTime;
+    }
+
+    public void setSignOutTime(Date signOutTime) {
+        this.signOutTime = signOutTime;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherAttendancesDto.java

@@ -0,0 +1,179 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.CourseSchedule;
+import com.ym.mec.biz.dal.enums.CourseStatusEnum;
+import com.ym.mec.biz.dal.enums.SignInStatusEnum;
+import com.ym.mec.biz.dal.enums.SignOutStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+public class TeacherAttendancesDto {
+
+    @ApiModelProperty(value = "老师名",required = false)
+	private String teacherName;
+
+    @ApiModelProperty(value = "分部名",required = false)
+	private String organName;
+
+    @ApiModelProperty(value = "教师编号",required = false)
+    private Integer teacherId;
+
+    @ApiModelProperty(value = "课程编号",required = false)
+    private Long courseScheduleId;
+
+    @ApiModelProperty(value = "课程名",required = false)
+    private String courseScheduleName;
+
+    @ApiModelProperty(value = "课程状态",required = false)
+    private CourseStatusEnum courseScheduleStatus;
+
+    @ApiModelProperty(value = "上课日期",required = false)
+    private String classDate;
+
+    @ApiModelProperty(value = "上课时间",required = false)
+    private String startClassTime;
+
+    @ApiModelProperty(value = "结束时间",required = false)
+    private String endClassTime;
+
+    @ApiModelProperty(value = "课程类型",required = false)
+    private CourseSchedule.CourseScheduleType courseScheduleType;
+
+    @ApiModelProperty(value = "签到状态(1正常签到，0异常签到) ",required = false)
+    private SignInStatusEnum signInStatus;
+
+    /** 状态(正常签到，异常签到) */
+    @ApiModelProperty(value = "签退状态(1正常签到，0异常签到) ",required = false)
+    private SignOutStatusEnum signOutStatus;
+
+    /** 备注 */
+    @ApiModelProperty(value = "备注",required = false)
+    private String remark;
+
+    @ApiModelProperty(value = "签到时间",required = false)
+    private Date signInTime;
+
+    @ApiModelProperty(value = "签退时间",required = false)
+    private Date signOutTime;
+
+    public String getOrganName() {
+        return organName;
+    }
+
+    public void setOrganName(String organName) {
+        this.organName = organName;
+    }
+
+    public String getClassDate() {
+        return classDate;
+    }
+
+    public void setClassDate(String classDate) {
+        this.classDate = classDate;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
+    public Integer getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Integer teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public Long getCourseScheduleId() {
+        return courseScheduleId;
+    }
+
+    public void setCourseScheduleId(Long courseScheduleId) {
+        this.courseScheduleId = courseScheduleId;
+    }
+
+    public String getCourseScheduleName() {
+        return courseScheduleName;
+    }
+
+    public void setCourseScheduleName(String courseScheduleName) {
+        this.courseScheduleName = courseScheduleName;
+    }
+
+    public CourseStatusEnum getCourseScheduleStatus() {
+        return courseScheduleStatus;
+    }
+
+    public void setCourseScheduleStatus(CourseStatusEnum courseScheduleStatus) {
+        this.courseScheduleStatus = courseScheduleStatus;
+    }
+
+    public String getStartClassTime() {
+        return startClassTime;
+    }
+
+    public void setStartClassTime(String startClassTime) {
+        this.startClassTime = startClassTime;
+    }
+
+    public String getEndClassTime() {
+        return endClassTime;
+    }
+
+    public void setEndClassTime(String endClassTime) {
+        this.endClassTime = endClassTime;
+    }
+
+    public CourseSchedule.CourseScheduleType getCourseScheduleType() {
+        return courseScheduleType;
+    }
+
+    public void setCourseScheduleType(CourseSchedule.CourseScheduleType courseScheduleType) {
+        this.courseScheduleType = courseScheduleType;
+    }
+
+    public SignInStatusEnum getSignInStatus() {
+        return signInStatus;
+    }
+
+    public void setSignInStatus(SignInStatusEnum signInStatus) {
+        this.signInStatus = signInStatus;
+    }
+
+    public SignOutStatusEnum getSignOutStatus() {
+        return signOutStatus;
+    }
+
+    public void setSignOutStatus(SignOutStatusEnum signOutStatus) {
+        this.signOutStatus = signOutStatus;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Date getSignInTime() {
+        return signInTime;
+    }
+
+    public void setSignInTime(Date signInTime) {
+        this.signInTime = signInTime;
+    }
+
+    public Date getSignOutTime() {
+        return signOutTime;
+    }
+
+    public void setSignOutTime(Date signOutTime) {
+        this.signOutTime = signOutTime;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherClassHeadInfo.java

@@ -1,6 +1,8 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.entity.CourseSchedule;
 import io.swagger.annotations.ApiModelProperty;
+import com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType;
 
 import java.util.Date;
 
@@ -49,6 +51,9 @@ public class TeacherClassHeadInfo {
     @ApiModelProperty(value = "班级名称",required = false)
     private String classGroupName;
 
+    @ApiModelProperty(value = "课程类型",required = false)
+    private CourseScheduleType CourseScheduleType;
+
 
     public Integer getTotalClassTimes() {
         return totalClassTimes;
@@ -153,4 +158,12 @@ public class TeacherClassHeadInfo {
     public void setClassGroupName(String classGroupName) {
         this.classGroupName = classGroupName;
     }
+
+    public CourseSchedule.CourseScheduleType getCourseScheduleType() {
+        return CourseScheduleType;
+    }
+
+    public void setCourseScheduleType(CourseSchedule.CourseScheduleType courseScheduleType) {
+        CourseScheduleType = courseScheduleType;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherDefaultSalaryDto.java

@@ -0,0 +1,236 @@
+package com.ym.mec.biz.dal.dto;
+
+import java.math.BigDecimal;
+
+public class TeacherDefaultSalaryDto {
+
+	private Integer userId;
+	
+	private String realName;
+	
+	private String organName;
+	
+	private String jobNature;
+	
+	private String demissionStatus;
+	
+	private String status;
+	
+	private BigDecimal vip1 = new BigDecimal(0);
+	
+	private BigDecimal vip2 = new BigDecimal(0);
+	
+	private BigDecimal vip3 = new BigDecimal(0);
+	
+	private BigDecimal vip4 = new BigDecimal(0);
+	
+	private BigDecimal vip5 = new BigDecimal(0);
+	
+	private BigDecimal practiceSalary = new BigDecimal(0);
+	
+	private BigDecimal singleSalary = new BigDecimal(0);
+	
+	private BigDecimal mixSalary = new BigDecimal(0);
+	
+	private BigDecimal comprehensiveSalary = new BigDecimal(0);
+	
+	private BigDecimal traningSigleSalary = new BigDecimal(0);
+	
+	private BigDecimal traningMixSalary = new BigDecimal(0);
+	
+	private BigDecimal highSalary = new BigDecimal(0);
+	
+	private BigDecimal classroomSalary = new BigDecimal(0);
+	
+	private BigDecimal highOnline3Salary = new BigDecimal(0);
+	
+	private BigDecimal highOnline4Salary = new BigDecimal(0);
+	
+	private BigDecimal highOnline5Salary = new BigDecimal(0);
+	
+	private BigDecimal musicNetwork1Salary = new BigDecimal(0);
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	public String getRealName() {
+		return realName;
+	}
+
+	public void setRealName(String realName) {
+		this.realName = realName;
+	}
+
+	public String getOrganName() {
+		return organName;
+	}
+
+	public void setOrganName(String organName) {
+		this.organName = organName;
+	}
+
+	public String getJobNature() {
+		return jobNature;
+	}
+
+	public void setJobNature(String jobNature) {
+		this.jobNature = jobNature;
+	}
+
+	public String getDemissionStatus() {
+		return demissionStatus;
+	}
+
+	public void setDemissionStatus(String demissionStatus) {
+		this.demissionStatus = demissionStatus;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public BigDecimal getVip1() {
+		return vip1;
+	}
+
+	public void setVip1(BigDecimal vip1) {
+		this.vip1 = vip1;
+	}
+
+	public BigDecimal getVip2() {
+		return vip2;
+	}
+
+	public void setVip2(BigDecimal vip2) {
+		this.vip2 = vip2;
+	}
+
+	public BigDecimal getVip3() {
+		return vip3;
+	}
+
+	public void setVip3(BigDecimal vip3) {
+		this.vip3 = vip3;
+	}
+
+	public BigDecimal getVip4() {
+		return vip4;
+	}
+
+	public void setVip4(BigDecimal vip4) {
+		this.vip4 = vip4;
+	}
+
+	public BigDecimal getVip5() {
+		return vip5;
+	}
+
+	public void setVip5(BigDecimal vip5) {
+		this.vip5 = vip5;
+	}
+
+	public BigDecimal getPracticeSalary() {
+		return practiceSalary;
+	}
+
+	public void setPracticeSalary(BigDecimal practiceSalary) {
+		this.practiceSalary = practiceSalary;
+	}
+
+	public BigDecimal getSingleSalary() {
+		return singleSalary;
+	}
+
+	public void setSingleSalary(BigDecimal singleSalary) {
+		this.singleSalary = singleSalary;
+	}
+
+	public BigDecimal getMixSalary() {
+		return mixSalary;
+	}
+
+	public void setMixSalary(BigDecimal mixSalary) {
+		this.mixSalary = mixSalary;
+	}
+
+	public BigDecimal getComprehensiveSalary() {
+		return comprehensiveSalary;
+	}
+
+	public void setComprehensiveSalary(BigDecimal comprehensiveSalary) {
+		this.comprehensiveSalary = comprehensiveSalary;
+	}
+
+	public BigDecimal getTraningSigleSalary() {
+		return traningSigleSalary;
+	}
+
+	public void setTraningSigleSalary(BigDecimal traningSigleSalary) {
+		this.traningSigleSalary = traningSigleSalary;
+	}
+
+	public BigDecimal getTraningMixSalary() {
+		return traningMixSalary;
+	}
+
+	public void setTraningMixSalary(BigDecimal traningMixSalary) {
+		this.traningMixSalary = traningMixSalary;
+	}
+
+	public BigDecimal getHighSalary() {
+		return highSalary;
+	}
+
+	public void setHighSalary(BigDecimal highSalary) {
+		this.highSalary = highSalary;
+	}
+
+	public BigDecimal getClassroomSalary() {
+		return classroomSalary;
+	}
+
+	public void setClassroomSalary(BigDecimal classroomSalary) {
+		this.classroomSalary = classroomSalary;
+	}
+
+	public BigDecimal getHighOnline3Salary() {
+		return highOnline3Salary;
+	}
+
+	public void setHighOnline3Salary(BigDecimal highOnline3Salary) {
+		this.highOnline3Salary = highOnline3Salary;
+	}
+
+	public BigDecimal getHighOnline4Salary() {
+		return highOnline4Salary;
+	}
+
+	public void setHighOnline4Salary(BigDecimal highOnline4Salary) {
+		this.highOnline4Salary = highOnline4Salary;
+	}
+
+	public BigDecimal getHighOnline5Salary() {
+		return highOnline5Salary;
+	}
+
+	public void setHighOnline5Salary(BigDecimal highOnline5Salary) {
+		this.highOnline5Salary = highOnline5Salary;
+	}
+
+	public BigDecimal getMusicNetwork1Salary() {
+		return musicNetwork1Salary;
+	}
+
+	public void setMusicNetwork1Salary(BigDecimal musicNetwork1Salary) {
+		this.musicNetwork1Salary = musicNetwork1Salary;
+	}
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherMusicClassInfoDto.java

@@ -1,13 +1,12 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.enums.JobNatureEnum;
 import com.ym.mec.biz.dal.enums.JobTypeEnum;
+import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
 
-import com.ym.mec.biz.dal.enums.JobNatureEnum;
-import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
-
 /**
  * 老师乐团课程信息
  */
@@ -31,7 +30,10 @@ public class TeacherMusicClassInfoDto {
     private String teacherRole;
 
     @ApiModelProperty(value = "执教班级名称", required = false)
-    private List<String> classGroupNames;
+    private String classGroupNames;
+
+    @ApiModelProperty(value = "执教班级编号", required = false)
+    private String classGroupIds;
 
     @ApiModelProperty(value = "教师乐团职务类型", required = false)
     private JobTypeEnum jobType;
@@ -42,6 +44,17 @@ public class TeacherMusicClassInfoDto {
     @ApiModelProperty(value = "出勤次数",required = false)
     private Integer attendanceNum;
 
+    @ApiModelProperty(value = "是否又剩余课时",required = false)
+    private Integer hasRestClass;
+
+    public Integer getHasRestClass() {
+        return hasRestClass;
+    }
+
+    public void setHasRestClass(Integer hasRestClass) {
+        this.hasRestClass = hasRestClass;
+    }
+
     public String getTeacherRole() {
         return teacherRole;
     }
@@ -106,14 +119,22 @@ public class TeacherMusicClassInfoDto {
         this.teamTeacherId = teamTeacherId;
     }
 
-    public List<String> getClassGroupNames() {
+    public String getClassGroupNames() {
         return classGroupNames;
     }
 
-    public void setClassGroupNames(List<String> classGroupNames) {
+    public void setClassGroupNames(String classGroupNames) {
         this.classGroupNames = classGroupNames;
     }
 
+    public String getClassGroupIds() {
+        return classGroupIds;
+    }
+
+    public void setClassGroupIds(String classGroupIds) {
+        this.classGroupIds = classGroupIds;
+    }
+
     public MusicGroupStatusEnum getStatus() {
         return status;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ClassGroup.java

@@ -75,17 +75,20 @@ public class ClassGroup {
 
 	/** 班级类型(普通班级、合奏班级) */
 	@ApiModelProperty(value = "是否删除，1是 0否", required = false)
-	private Integer delFlag;
+	private Integer delFlag = 0;
 
 	@ApiModelProperty(value = "总统课次",required = false)
-	private Integer totalClassTimes;
+	private Integer totalClassTimes = 0;
 
 	@ApiModelProperty(value = "当前课次",required = false)
-	private Integer currentClassTimes;
+	private Integer currentClassTimes = 0;
 	
 	@ApiModelProperty(value = "班级图标",required = false)
 	private String img;
 	
+	@ApiModelProperty(value = "备注",required = false)
+	private String memo;
+	
 	private List<ClassGroupTeacherMapper> teacherMapperList = new ArrayList<ClassGroupTeacherMapper>();
 	
 	private List<CourseSchedule> courseScheduleList = new ArrayList<CourseSchedule>();
@@ -250,6 +253,14 @@ public class ClassGroup {
 		this.img = img;
 	}
 
+	public String getMemo() {
+		return memo;
+	}
+
+	public void setMemo(String memo) {
+		this.memo = memo;
+	}
+
 	public List<ClassGroupTeacherMapper> getTeacherMapperList() {
 		return teacherMapperList;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CooperationOrgan.java

@@ -41,6 +41,8 @@ public class CooperationOrgan {
 	/** 分部编号 */
 	@ApiModelProperty(value = "分部编号", required = false)
 	private Integer organId;
+	
+	private Organization organization = new Organization();
 
 	/** 联系人 */
 	@ApiModelProperty(value = "联系人", required = false)
@@ -60,6 +62,9 @@ public class CooperationOrgan {
 
 	@ApiModelProperty(value = "权属类型(OWN('自有'),COOPERATION('合作'),LEASE('租赁'))", required = false)
 	private OwnershipType ownershipType;
+	
+	@ApiModelProperty(value = "是否启用", required = false)
+	private Boolean isEnable;
 
 	/**  */
 	private java.util.Date createTime;
@@ -75,6 +80,14 @@ public class CooperationOrgan {
 		this.organId = organId;
 	}
 
+	public Organization getOrganization() {
+		return organization;
+	}
+
+	public void setOrganization(Organization organization) {
+		this.organization = organization;
+	}
+
 	public void setId(Integer id) {
 		this.id = id;
 	}
@@ -147,6 +160,14 @@ public class CooperationOrgan {
 		this.ownershipType = ownershipType;
 	}
 
+	public Boolean getIsEnable() {
+		return isEnable;
+	}
+
+	public void setIsEnable(Boolean isEnable) {
+		this.isEnable = isEnable;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseSchedule.java

@@ -4,9 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.common.enums.BaseEnum;
-
 import io.swagger.annotations.ApiModelProperty;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -31,7 +29,7 @@ public class CourseSchedule {
 
 		SINGLE("SINGLE", "单技课"), MIX("MIX", "合奏课"), HIGH("HIGH", "小班课"), VIP("VIP", "vip课"), DEMO("DEMO", "试听课"), COMPREHENSIVE("COMPREHENSIVE", "综合课"), PRACTICE(
 				"PRACTICE", "网管课"), ENLIGHTENMENT("ENLIGHTENMENT", "启蒙课"), TRAINING_SINGLE("TRAINING_SINGLE", "集训单技课"), TRAINING_MIX("TRAINING_MIX", "集训合奏课"), CLASSROOM(
-				"CLASSROOM", "课堂课"),COMM("COMM","对外课程"),HIGH_ONLINE("HIGH_ONLINE","线上小班课");
+				"CLASSROOM", "课堂课"),COMM("COMM","对外课程"),HIGH_ONLINE("HIGH_ONLINE","线上基础技能课"),MUSIC_NETWORK("MUSIC_NETWORK","乐团网管课");
 
 		private String code;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseScheduleModifyLog.java

@@ -21,10 +21,10 @@ public class CourseScheduleModifyLog {
 	
 	/**  */
 	private String currentCourseSchedule;
-	
+
 	/**  */
 	private java.util.Date createTime;
-	
+
 	public void setId(Long id){
 		this.id = id;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseScheduleTeacherSalary.java

@@ -48,6 +48,9 @@ public class CourseScheduleTeacherSalary {
 	
 	/** 实际薪水 */
 	private java.math.BigDecimal actualSalary;
+
+	/** 课酬结算时计算的课酬 */
+	private java.math.BigDecimal teacherActualSalary;
 	
 	/** 结算时间 */
 	private java.util.Date settlementTime;
@@ -62,6 +65,14 @@ public class CourseScheduleTeacherSalary {
 
 	private String memo;
 
+	public BigDecimal getTeacherActualSalary() {
+		return teacherActualSalary;
+	}
+
+	public void setTeacherActualSalary(BigDecimal teacherActualSalary) {
+		this.teacherActualSalary = teacherActualSalary;
+	}
+
 	public CourseScheduleTeacherSalary() {
 	}
 
@@ -165,7 +176,7 @@ public class CourseScheduleTeacherSalary {
 	public Integer getUserId(){
 		return this.userId;
 	}
-			
+
 	public void setExpectSalary(java.math.BigDecimal expectSalary){
 		this.expectSalary = expectSalary;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CoursesGroup.java

@@ -8,7 +8,7 @@ import java.math.BigDecimal;
 /**
  * 对应数据库表(courses_group):
  */
-public class CoursesGroup {
+public class CoursesGroup{
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CoursesGroupModifyLog.java

@@ -0,0 +1,79 @@
+package com.ym.mec.biz.dal.entity;
+
+import java.util.Date;
+
+/**
+ * 对应数据库表(courses_group_modify_log):
+ */
+public class CoursesGroupModifyLog{
+
+	private Long id;
+
+	private String groupId;
+
+	private Integer operatorId;
+
+	private String groupType;
+
+	private String previousGroup;
+
+	private String currentGroup;
+
+	private Date createTime;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getGroupId() {
+		return groupId;
+	}
+
+	public void setGroupId(String groupId) {
+		this.groupId = groupId;
+	}
+
+	public Integer getOperatorId() {
+		return operatorId;
+	}
+
+	public void setOperatorId(Integer operatorId) {
+		this.operatorId = operatorId;
+	}
+
+	public String getGroupType() {
+		return groupType;
+	}
+
+	public void setGroupType(String groupType) {
+		this.groupType = groupType;
+	}
+
+	public String getPreviousGroup() {
+		return previousGroup;
+	}
+
+	public void setPreviousGroup(String previousGroup) {
+		this.previousGroup = previousGroup;
+	}
+
+	public String getCurrentGroup() {
+		return currentGroup;
+	}
+
+	public void setCurrentGroup(String currentGroup) {
+		this.currentGroup = currentGroup;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/DegreeRegistration.java

@@ -0,0 +1,312 @@
+package com.ym.mec.biz.dal.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class DegreeRegistration {
+    private Integer id;
+
+    /**
+     * 零星支付id
+     */
+    @ApiModelProperty(value = "零星支付id",required = true)
+    private Integer sporadicId;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty(value = "订单编号",required = false)
+    private String orderNo;
+
+
+    /**
+     * 订单流水号
+     */
+    @ApiModelProperty(value = "订单流水号",required = false)
+    private String transNo;
+
+
+    /**
+     * 姓名
+     */
+    @ApiModelProperty(value = "名字",required = true)
+    private String name;
+
+    /**
+     * 性别
+     */
+    @ApiModelProperty(value = "性别",required = true)
+    private String gender;
+
+    /**
+     * 身份证号
+     */
+    @ApiModelProperty(value = "身份证号",required = true)
+    private String idcard;
+
+    /**
+     * 城市
+     */
+    @ApiModelProperty(value = "城市",required = true)
+    private String city;
+
+    /**
+     * 学校
+     */
+    @ApiModelProperty(value = "学校",required = true)
+    private String school;
+
+    /**
+     * 乐器
+     */
+    @ApiModelProperty(value = "乐器",required = true)
+    private String subject;
+
+    /**
+     * 考试级别
+     */
+    @ApiModelProperty(value = "考试级别",required = true)
+    private String level;
+
+    /**
+     * 乐理级别
+     */
+    @ApiModelProperty(value = "乐理级别",required = true)
+    private String theoryLevel;
+
+
+    /**
+     * 乐理级别证书
+     */
+    @ApiModelProperty(value = "乐理级别证书",required = true)
+    private String theoryCert;
+
+    /**
+     * 家长联系电话
+     */
+    @ApiModelProperty(value = "家长联系电话",required = true)
+    private String mobile;
+
+    /**
+     * 考级费用
+     */
+    @ApiModelProperty(value = "考级费用",required = false)
+    private BigDecimal money;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注",required = false)
+    private String memo;
+
+    /**
+     * 乐理费用
+     */
+    @ApiModelProperty(value = "乐理费用",required = true)
+    private BigDecimal theoryMoney;
+
+    /**
+     * 报名时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 0-未支付 1-支付中 2-支付中
+     */
+    private Integer status;
+
+
+    /**
+     * 0-未支付 1-支付中 2-支付中
+     */
+    private String statusStr;
+
+    /**
+     *  是否重新支付
+     */
+    @ApiModelProperty(value = "是否重新支付",required = false)
+    private Boolean isRepay = false;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getSporadicId() {
+        return sporadicId;
+    }
+
+    public void setSporadicId(Integer sporadicId) {
+        this.sporadicId = sporadicId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    public String getIdcard() {
+        return idcard;
+    }
+
+    public void setIdcard(String idcard) {
+        this.idcard = idcard;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getSchool() {
+        return school;
+    }
+
+    public void setSchool(String school) {
+        this.school = school;
+    }
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public String getTheoryLevel() {
+        return theoryLevel;
+    }
+
+    public void setTheoryLevel(String theoryLevel) {
+        this.theoryLevel = theoryLevel;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public BigDecimal getMoney() {
+        return money;
+    }
+
+    public void setMoney(BigDecimal money) {
+        this.money = money;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Boolean getIsRepay() {
+        return isRepay;
+    }
+
+    public void setIsRepay(Boolean repay) {
+        isRepay = repay;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    public BigDecimal getTheoryMoney() {
+        return theoryMoney;
+    }
+
+    public void setTheoryMoney(BigDecimal theoryMoney) {
+        this.theoryMoney = theoryMoney;
+    }
+
+    public String getTheoryCert() {
+        return theoryCert;
+    }
+
+    public void setTheoryCert(String theoryCert) {
+        this.theoryCert = theoryCert;
+    }
+
+    public String getStatusStr() {
+        return statusStr;
+    }
+
+    public void setStatusStr(String statusStr) {
+        this.statusStr = statusStr;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getTransNo() {
+        return transNo;
+    }
+
+    public void setTransNo(String transNo) {
+        this.transNo = transNo;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroup.java

@@ -1,18 +1,21 @@
 package com.ym.mec.biz.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
 import com.ym.mec.biz.dal.entity.CooperationOrgan.OwnershipType;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.FeeType;
 import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
 import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-import java.util.Date;
 
 /**
  * 对应数据库表(music_group):
  */
-public class MusicGroup{
+public class MusicGroup {
 
 	/**  */
 	private String id;
@@ -146,6 +149,22 @@ public class MusicGroup{
 	private Integer groupMemberNum;
 	
 	private OwnershipType ownershipType;
+	
+	private FeeType feeType;
+	
+	private Boolean delFlag;
+
+	private String subjectName;
+
+	private Boolean hasVerifyMusicalList = false;
+
+	public String getSubjectName() {
+		return subjectName;
+	}
+
+	public void setSubjectName(String subjectName) {
+		this.subjectName = subjectName;
+	}
 
 	public Integer getRepairUserId() {
 		return repairUserId;
@@ -467,9 +486,32 @@ public class MusicGroup{
 		this.ownershipType = ownershipType;
 	}
 
+	public FeeType getFeeType() {
+		return feeType;
+	}
+
+	public void setFeeType(FeeType feeType) {
+		this.feeType = feeType;
+	}
+
+	public Boolean getDelFlag() {
+		return delFlag;
+	}
+
+	public void setDelFlag(Boolean delFlag) {
+		this.delFlag = delFlag;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);
 	}
 
+	public Boolean getHasVerifyMusicalList() {
+		return hasVerifyMusicalList;
+	}
+
+	public void setHasVerifyMusicalList(Boolean hasVerifyMusicalList) {
+		this.hasVerifyMusicalList = hasVerifyMusicalList;
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupPaymentCalender.java

@@ -1,13 +1,29 @@
 package com.ym.mec.biz.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
+import com.ym.mec.common.enums.BaseEnum;
+
 /**
  * 对应数据库表(music_group_payment_calender):
  */
 public class MusicGroupPaymentCalender implements Comparable<MusicGroupPaymentCalender> {
 
+	public enum FeeType implements BaseEnum<String, FeeType> {
+		OFFLINE, ONLINE, ALL;
+
+		@Override
+		public String getCode() {
+			return this.name();
+		}
+
+	}
+
 	/**  */
 	private Long id;
 
@@ -23,12 +39,34 @@ public class MusicGroupPaymentCalender implements Comparable<MusicGroupPaymentCa
 	@ApiModelProperty(value = "开始缴费日期", required = false)
 	private java.util.Date startPaymentDate;
 
+	private Date deadlinePaymentDate;
+
+	private PaymentStatusEnum paymentStatus;
+
+	private Integer expectNum;
+
+	private Integer actualNum;
+
+	private String memo;
+	
+	private FeeType type;
+
 	/**  */
 	private java.util.Date createTime;
 
 	/**  */
 	private java.util.Date updateTime;
 
+	private String studentIds;
+
+	public String getStudentIds() {
+		return studentIds;
+	}
+
+	public void setStudentIds(String studentIds) {
+		this.studentIds = studentIds;
+	}
+
 	public void setId(Long id) {
 		this.id = id;
 	}
@@ -77,6 +115,54 @@ public class MusicGroupPaymentCalender implements Comparable<MusicGroupPaymentCa
 		return this.updateTime;
 	}
 
+	public Date getDeadlinePaymentDate() {
+		return deadlinePaymentDate;
+	}
+
+	public void setDeadlinePaymentDate(Date deadlinePaymentDate) {
+		this.deadlinePaymentDate = deadlinePaymentDate;
+	}
+
+	public PaymentStatusEnum getPaymentStatus() {
+		return paymentStatus;
+	}
+
+	public void setPaymentStatus(PaymentStatusEnum paymentStatus) {
+		this.paymentStatus = paymentStatus;
+	}
+
+	public Integer getExpectNum() {
+		return expectNum;
+	}
+
+	public void setExpectNum(Integer expectNum) {
+		this.expectNum = expectNum;
+	}
+
+	public Integer getActualNum() {
+		return actualNum;
+	}
+
+	public void setActualNum(Integer actualNum) {
+		this.actualNum = actualNum;
+	}
+
+	public String getMemo() {
+		return memo;
+	}
+
+	public void setMemo(String memo) {
+		this.memo = memo;
+	}
+
+	public FeeType getType() {
+		return type;
+	}
+
+	public void setType(FeeType type) {
+		this.type = type;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupPaymentCalenderDetail.java

@@ -0,0 +1,194 @@
+package com.ym.mec.biz.dal.entity;
+
+import com.ym.mec.auth.api.entity.SysUser;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
+
+import java.util.Date;
+
+/**
+ * 对应数据库表(music_group_payment_calender_detail):
+ */
+public class MusicGroupPaymentCalenderDetail {
+
+	/**  */
+	private Long id;
+	
+	/**  */
+	private Long musicGroupPaymentCalenderId;
+	
+	/**  */
+	private Integer userId;
+	
+	/**  */
+	private java.math.BigDecimal expectAmount;
+	
+	/**  */
+	private java.math.BigDecimal actualAmount;
+	
+	/**  */
+	private PaymentStatus paymentStatus;
+	
+	/**  */
+	private String userStatus;
+
+	/**  */
+	private String musicGroupId;
+
+	/**1是0否  */
+	private Integer open;
+	
+	/**  */
+	private java.util.Date payTime;
+
+	/**  */
+	private java.util.Date startPaymentDate;
+
+	/**  */
+	private java.util.Date deadlinePaymentDate;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	/**  */
+	private java.util.Date createTime;
+
+	private SysUser sysUser = new SysUser();
+
+	private StudentRegistration studentRegistration = new StudentRegistration();
+
+	public String getMusicGroupId() {
+		return musicGroupId;
+	}
+
+	public void setMusicGroupId(String musicGroupId) {
+		this.musicGroupId = musicGroupId;
+	}
+
+	public Date getStartPaymentDate() {
+		return startPaymentDate;
+	}
+
+	public void setStartPaymentDate(Date startPaymentDate) {
+		this.startPaymentDate = startPaymentDate;
+	}
+
+	public Date getDeadlinePaymentDate() {
+		return deadlinePaymentDate;
+	}
+
+	public void setDeadlinePaymentDate(Date deadlinePaymentDate) {
+		this.deadlinePaymentDate = deadlinePaymentDate;
+	}
+
+	public Integer getOpen() {
+		return open;
+	}
+
+	public void setOpen(Integer open) {
+		this.open = open;
+	}
+
+	public StudentRegistration getStudentRegistration() {
+		return studentRegistration;
+	}
+
+	public void setStudentRegistration(StudentRegistration studentRegistration) {
+		this.studentRegistration = studentRegistration;
+	}
+
+	public SysUser getSysUser() {
+		return sysUser;
+	}
+
+	public void setSysUser(SysUser sysUser) {
+		this.sysUser = sysUser;
+	}
+
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setMusicGroupPaymentCalenderId(Long musicGroupPaymentCalenderId){
+		this.musicGroupPaymentCalenderId = musicGroupPaymentCalenderId;
+	}
+	
+	public Long getMusicGroupPaymentCalenderId(){
+		return this.musicGroupPaymentCalenderId;
+	}
+			
+	public void setUserId(Integer userId){
+		this.userId = userId;
+	}
+	
+	public Integer getUserId(){
+		return this.userId;
+	}
+			
+	public void setExpectAmount(java.math.BigDecimal expectAmount){
+		this.expectAmount = expectAmount;
+	}
+	
+	public java.math.BigDecimal getExpectAmount(){
+		return this.expectAmount;
+	}
+			
+	public void setActualAmount(java.math.BigDecimal actualAmount){
+		this.actualAmount = actualAmount;
+	}
+	
+	public java.math.BigDecimal getActualAmount(){
+		return this.actualAmount;
+	}
+			
+	public void setPaymentStatus(PaymentStatus paymentStatus){
+		this.paymentStatus = paymentStatus;
+	}
+	
+	public PaymentStatus getPaymentStatus(){
+		return this.paymentStatus;
+	}
+			
+	public void setUserStatus(String userStatus){
+		this.userStatus = userStatus;
+	}
+	
+	public String getUserStatus(){
+		return this.userStatus;
+	}
+			
+	public void setPayTime(java.util.Date payTime){
+		this.payTime = payTime;
+	}
+	
+	public java.util.Date getPayTime(){
+		return this.payTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupStudentFee.java

@@ -1,12 +1,10 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.auth.api.entity.SysUser;
 import io.swagger.annotations.ApiModelProperty;
-
 import java.math.BigDecimal;
 import java.util.Date;
-
 import org.apache.commons.lang3.builder.ToStringBuilder;
-
 import com.ym.mec.common.enums.BaseEnum;
 
 /**
@@ -79,6 +77,12 @@ public class MusicGroupStudentFee {
 	/**  */
 	private java.util.Date updateTime;
 
+	private SysUser sysUser;
+
+	private String subjectName;
+
+	private Integer remainNetworkClassTimes = 0;
+
 	public MusicGroupStudentFee(String musicGroupId, Integer userId, Integer subjectId,
 								BigDecimal courseFee, Date nextPaymentDate, BigDecimal temporaryCourseFee,PaymentStatus paymentStatus) {
 		this.musicGroupId = musicGroupId;
@@ -94,6 +98,22 @@ public class MusicGroupStudentFee {
 	public MusicGroupStudentFee() {
 	}
 
+	public SysUser getSysUser() {
+		return sysUser;
+	}
+
+	public void setSysUser(SysUser sysUser) {
+		this.sysUser = sysUser;
+	}
+
+	public String getSubjectName() {
+		return subjectName;
+	}
+
+	public void setSubjectName(String subjectName) {
+		this.subjectName = subjectName;
+	}
+
 	public Integer getIsLock() {
 		return isLock;
 	}
@@ -206,6 +226,13 @@ public class MusicGroupStudentFee {
 		this.temporaryCourseFee = temporaryCourseFee;
 	}
 
+	public Integer getRemainNetworkClassTimes() {
+		return remainNetworkClassTimes;
+	}
+
+	public void setRemainNetworkClassTimes(Integer remainNetworkClassTimes) {
+		this.remainNetworkClassTimes = remainNetworkClassTimes;
+	}
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SporadicChargeInfo.java

@@ -47,9 +47,20 @@ public class SporadicChargeInfo {
 	@ApiModelProperty(value = "操作人", required = true)
 	private String operatorName;
 
+	@ApiModelProperty(value = "是否关闭", required = true)
+	private Integer openFlag;
+
 	@ApiModelProperty(value = "是否删除", required = true)
 	private Integer delFlag;
 
+	public Integer getOpenFlag() {
+		return openFlag;
+	}
+
+	public void setOpenFlag(Integer openFlag) {
+		this.openFlag = openFlag;
+	}
+
 	public String getUserName() {
 		return userName;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Student.java

@@ -13,6 +13,9 @@ public class Student {
 	/**  */
 	private String subjectIdList;
 
+	/**  */
+	private String subjectNames;
+
 	private Integer serviceTag;
 
 	private Integer operatingTag;
@@ -32,6 +35,14 @@ public class Student {
 		this.subjectIdList = subjectIdList;
 	}
 
+	public String getSubjectNames() {
+		return subjectNames;
+	}
+
+	public void setSubjectNames(String subjectNames) {
+		this.subjectNames = subjectNames;
+	}
+
 	public Student(Integer userId) {
 		this.userId = userId;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentExtracurricularExercisesSituation.java

@@ -2,6 +2,8 @@ package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.util.Date;
+
 /**
  * 对应数据库表(student_extracurricular_exercises_situation_):
  */
@@ -45,7 +47,27 @@ public class StudentExtracurricularExercisesSituation {
 	
 	/**  */
 	private java.util.Date updateTime;
-	
+
+	private Date lastSubmitTime;
+
+	private String serveType;
+
+	public String getServeType() {
+		return serveType;
+	}
+
+	public void setServeType(String serveType) {
+		this.serveType = serveType;
+	}
+
+	public Date getLastSubmitTime() {
+		return lastSubmitTime;
+	}
+
+	public void setLastSubmitTime(Date lastSubmitTime) {
+		this.lastSubmitTime = lastSubmitTime;
+	}
+
 	public void setId(Long id){
 		this.id = id;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentPaymentRouteOrder.java

@@ -0,0 +1,94 @@
+package com.ym.mec.biz.dal.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class StudentPaymentRouteOrder {
+    private Long id;
+
+    /**
+    * 分配分部id
+    */
+    private Integer routeOrganId;
+
+    /**
+    * 分润金额
+    */
+    private BigDecimal routeAmount;
+
+    /**
+    * 分润余额
+    */
+    private BigDecimal routeBalanceAmount;
+
+    /**
+    * 渠道收款账户
+    */
+    private String merNo;
+
+    /**
+     * 原始订单号
+     */
+    private String orderNo;
+
+    /**
+    * 是否承担手续费Y-是 N-否
+    */
+    private String feeFlag;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Integer getRouteOrganId() {
+        return routeOrganId;
+    }
+
+    public void setRouteOrganId(Integer routeOrganId) {
+        this.routeOrganId = routeOrganId;
+    }
+
+    public BigDecimal getRouteAmount() {
+        return routeAmount;
+    }
+
+    public void setRouteAmount(BigDecimal routeAmount) {
+        this.routeAmount = routeAmount;
+    }
+
+    public String getMerNo() {
+        return merNo;
+    }
+
+    public void setMerNo(String merNo) {
+        this.merNo = merNo;
+    }
+
+    public String getFeeFlag() {
+        return feeFlag;
+    }
+
+    public void setFeeFlag(String feeFlag) {
+        this.feeFlag = feeFlag;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public BigDecimal getRouteBalanceAmount() {
+        return routeBalanceAmount;
+    }
+
+    public void setRouteBalanceAmount(BigDecimal routeBalanceAmount) {
+        this.routeBalanceAmount = routeBalanceAmount;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentRegistration.java

@@ -1,18 +1,16 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.entity.CooperationOrgan.OwnershipType;
+import com.ym.mec.biz.dal.enums.KitPurchaseMethodEnum;
+import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
+import com.ym.mec.biz.dal.enums.StudentMusicGroupStatusEnum;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-import com.ym.mec.biz.dal.enums.ClassGroupStudentStatusEnum;
-import com.ym.mec.biz.dal.enums.KitPurchaseMethodEnum;
-import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
-import com.ym.mec.biz.dal.entity.CooperationOrgan.OwnershipType;
-
 /**
  * 对应数据库表(student_registration):
  */
@@ -85,7 +83,7 @@ public class StudentRegistration {
     private PaymentStatusEnum paymentStatus;
 
     @ApiModelProperty(value = "用户所在乐团状态）",required = false)
-    private ClassGroupStudentStatusEnum musicGroupStatus;
+    private StudentMusicGroupStatusEnum musicGroupStatus;
 
     @ApiModelProperty(value = "班级id", required = true)
     private Integer classGroupId;
@@ -129,7 +127,7 @@ public class StudentRegistration {
         this.transferStudent = transferStudent;
     }
 
-    public ClassGroupStudentStatusEnum getMusicGroupStatus() {
+    public StudentMusicGroupStatusEnum getMusicGroupStatus() {
         return musicGroupStatus;
     }
 
@@ -142,7 +140,7 @@ public class StudentRegistration {
         this.birthdate = birthdate;
     }
 
-    public void setMusicGroupStatus(ClassGroupStudentStatusEnum musicGroupStatus) {
+    public void setMusicGroupStatus(StudentMusicGroupStatusEnum musicGroupStatus) {
         this.musicGroupStatus = musicGroupStatus;
     }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentRepair.java

@@ -1,5 +1,8 @@
 package com.ym.mec.biz.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -8,132 +11,164 @@ public class StudentRepair {
     /**
     * 维修单号
     */
+    @ApiModelProperty(value = "维修单号", required = false)
     private String transNo;
 
     /**
     * 分部id
     */
+    @ApiModelProperty(value = "分部id", required = false)
     private Integer organId;
 
 
     /**
-    * 分部id
+    * 分部名称
     */
+    @ApiModelProperty(value = "分部名称", required = false)
     private String organName;
 
     /**
     * 学生id
     */
+    @ApiModelProperty(value = "学生id", required = true)
     private Integer studentId;
 
     /**
     * 学生姓名
     */
+    @ApiModelProperty(value = "学生姓名", required = false)
     private String studentName;
 
     /**
     * 学生学校
     */
+    @ApiModelProperty(value = "学生学校", required = false)
     private String studentSchool;
 
     /**
     * 技师id
     */
+    @ApiModelProperty(value = "技师id", required = false)
     private Integer employeeId;
 
     /**
      * 技师名字
      */
+    @ApiModelProperty(value = "技师名字", required = false)
     private String employeeName;
 
     /**
      * 技师电话
      */
+    @ApiModelProperty(value = "技师电话", required = false)
     private String employeePhone;
 
     /**
      * 技师联系地址
      */
+    @ApiModelProperty(value = "技师联系地址", required = false)
     private String employeeAddress;
 
     /**
     * 乐器类型id
     */
+    @ApiModelProperty(value = "乐器类型id", required = false)
     private Integer subjectId;
 
     /**
     * 乐器类型名称
     */
+    @ApiModelProperty(value = "乐器类型名称", required = false)
     private String subjectName;
 
     /**
     * 维修类型 0-线下 1-线上
     */
+    @ApiModelProperty(value = "维修类型 0-线下 1-线上", required = false)
     private Integer type;
 
     /**
     * 乐器编号
     */
+    @ApiModelProperty(value = "乐器编号", required = false)
     private String instrumentNo;
 
     /**
+     * 费用组成
+     */
+    @ApiModelProperty(value = "费用组成", required = false)
+    private String feeList;
+
+    /**
     * 问题描述及解决方法
     */
+    @ApiModelProperty(value = "问题描述及解决方法", required = false)
     private String description;
 
     /**
     * 维修金额
     */
+    @ApiModelProperty(value = "维修金额", required = false)
     private BigDecimal amount;
 
     /**
     * 维修完成时间
     */
+    @ApiModelProperty(value = "维修完成时间", required = false)
     private Date finishTime;
 
     /**
     * 乐器取回方式 0-自取 1-快递
     */
+    @ApiModelProperty(value = "乐器取回方式 0-自取 1-快递", required = false)
     private Integer sendType;
 
     /**
     * 联系人
     */
+    @ApiModelProperty(value = "联系人", required = false)
     private String contactName;
 
     /**
     * 联系方式
     */
+    @ApiModelProperty(value = "联系方式", required = false)
     private String contactMobile;
 
     /**
     * 快递地址
     */
+    @ApiModelProperty(value = "快递地址", required = false)
     private String address;
 
     /**
     * 支付状态 0-未支付 1-支付中 2-已支付
     */
+    @ApiModelProperty(value = "支付状态 0-未支付 1-支付中 2-已支付", required = false)
     private Integer payStatus;
 
     /**
-    * 支付状态 0维修中，1已完成
+    * 维修状态 0维修中，1已完成
     */
+    @ApiModelProperty(value = "维修状态 0维修中，1已完成", required = false)
     private Integer repairStatus;
 
     /**
      * 使用余额
      */
+    @ApiModelProperty(value = "使用余额", required = false)
     private Boolean isUseBalancePayment;
 
     /**
     * 送修时间
     */
+    @ApiModelProperty(value = "送修时间", required = true)
     private Date createTime;
 
     /**
     * 更新时间
     */
+    @ApiModelProperty(value = "更新时间", required = false)
     private Date updateTime;
 
     public String getOrganName() {
@@ -248,6 +283,14 @@ public class StudentRepair {
         this.instrumentNo = instrumentNo;
     }
 
+    public String getFeeList() {
+        return feeList;
+    }
+
+    public void setFeeList(String feeList) {
+        this.feeList = feeList;
+    }
+
     public String getDescription() {
         return description;
     }
@@ -351,4 +394,9 @@ public class StudentRepair {
     public void setIsUseBalancePayment(Boolean useBalancePayment) {
         isUseBalancePayment = useBalancePayment;
     }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysPaymentConfig.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.PaymentChannelEnum;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 
@@ -11,12 +12,37 @@ public class SysPaymentConfig {
     private Integer id;
 
     /**
+     * 支付渠道
+     */
+    @ApiModelProperty(value = "支付渠道")
+    private PaymentChannelEnum payType;
+
+    /**
+     * 双乾商户号
+     */
+    @ApiModelProperty(value = "双乾商户号")
+    private String yqMerNo;
+
+
+    /**
+     * 双乾商户号
+     */
+    @ApiModelProperty(value = "汇付商户号")
+    private String hfMerNo;
+
+    /**
      * type
      */
     @ApiModelProperty(value = "type（1-比例 2-类型）")
     private Integer type;
 
     /**
+     * 分润规则
+     */
+    @ApiModelProperty(value = "分润规则")
+    private String routeScale;
+
+    /**
      * 分部id
      */
     @ApiModelProperty(value = "分部id")
@@ -86,6 +112,14 @@ public class SysPaymentConfig {
         this.id = id;
     }
 
+    public PaymentChannelEnum getPayType() {
+        return payType;
+    }
+
+    public void setPayType(PaymentChannelEnum payType) {
+        this.payType = payType;
+    }
+
     public Integer getOrganId() {
         return organId;
     }
@@ -173,5 +207,29 @@ public class SysPaymentConfig {
     public void setType(Integer type) {
         this.type = type;
     }
+
+    public String getYqMerNo() {
+        return yqMerNo;
+    }
+
+    public void setYqMerNo(String yqMerNo) {
+        this.yqMerNo = yqMerNo;
+    }
+
+    public String getHfMerNo() {
+        return hfMerNo;
+    }
+
+    public void setHfMerNo(String hfMerNo) {
+        this.hfMerNo = hfMerNo;
+    }
+
+    public String getRouteScale() {
+        return routeScale;
+    }
+
+    public void setRouteScale(String routeScale) {
+        this.routeScale = routeScale;
+    }
 }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Teacher.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.entity;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.enums.JobNatureEnum;
 import com.ym.mec.biz.dal.enums.JobTypeEnum;
+import com.ym.mec.biz.dal.enums.ProbationPeriodEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -26,7 +27,7 @@ public class Teacher extends SysUser {
 
 	/** 是否试用期 */
 	@ApiModelProperty(value = "是否试用期1是，0否", required = false)
-	private YesOrNoEnum isProbationPeriod;
+	private ProbationPeriodEnum isProbationPeriod;
 
 	/** 学历 */
 	@ApiModelProperty(value = "学历", required = false)
@@ -214,11 +215,11 @@ public class Teacher extends SysUser {
 		this.jobType = jobType;
 	}
 
-	public YesOrNoEnum getIsProbationPeriod() {
+	public ProbationPeriodEnum getIsProbationPeriod() {
 		return isProbationPeriod;
 	}
 
-	public void setIsProbationPeriod(YesOrNoEnum isProbationPeriod) {
+	public void setIsProbationPeriod(ProbationPeriodEnum isProbationPeriod) {
 		this.isProbationPeriod = isProbationPeriod;
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TeacherAttendance.java

@@ -1,10 +1,9 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.ComplaintsStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
-
 import io.swagger.annotations.ApiModelProperty;
-
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.Date;
@@ -61,6 +60,9 @@ public class TeacherAttendance {
 	/**  */
 	private java.util.Date createTime;
 
+	//申述提交时间
+	private java.util.Date complaintsTime;
+
 	private String signInLongitudeLatitude;
 
 	private String signOutLongitudeLatitude;
@@ -69,6 +71,68 @@ public class TeacherAttendance {
 
 	private Integer update;
 
+	private int isComplaints;
+
+	//申述状态0拒绝1通过2待处理3已撤销
+	private ComplaintsStatusEnum complaintsStatus;
+
+	//申述内容
+	private String complaintsContent;
+
+	//处理结果
+	private String disposeContent;
+
+	//处理结果
+	private Integer operator;
+
+	public Date getComplaintsTime() {
+		return complaintsTime;
+	}
+
+	public void setComplaintsTime(Date complaintsTime) {
+		this.complaintsTime = complaintsTime;
+	}
+
+	public Integer getOperator() {
+		return operator;
+	}
+
+	public void setOperator(Integer operator) {
+		this.operator = operator;
+	}
+
+	public int getIsComplaints() {
+		return isComplaints;
+	}
+
+	public void setIsComplaints(int isComplaints) {
+		this.isComplaints = isComplaints;
+	}
+
+	public ComplaintsStatusEnum getComplaintsStatus() {
+		return complaintsStatus;
+	}
+
+	public void setComplaintsStatus(ComplaintsStatusEnum complaintsStatus) {
+		this.complaintsStatus = complaintsStatus;
+	}
+
+	public String getComplaintsContent() {
+		return complaintsContent;
+	}
+
+	public void setComplaintsContent(String complaintsContent) {
+		this.complaintsContent = complaintsContent;
+	}
+
+	public String getDisposeContent() {
+		return disposeContent;
+	}
+
+	public void setDisposeContent(String disposeContent) {
+		this.disposeContent = disposeContent;
+	}
+
 	public String getSchoolLongitudeLatitude() {
 		return schoolLongitudeLatitude;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/VipGroup.java

@@ -132,6 +132,26 @@ public class VipGroup {
 
 	private String lastOverTime;
 
+	private BigDecimal courseUnitPrice;
+
+	private int enableDelete;
+
+	public Integer getEnableDelete() {
+		return enableDelete;
+	}
+
+	public void setEnableDelete(Integer enableDelete) {
+		this.enableDelete = enableDelete;
+	}
+
+	public BigDecimal getCourseUnitPrice() {
+		return courseUnitPrice;
+	}
+
+	public void setCourseUnitPrice(BigDecimal courseUnitPrice) {
+		this.courseUnitPrice = courseUnitPrice;
+	}
+
 	public String getLastOverTime() {
 		return lastOverTime;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/ClassGroupTypeEnum.java

@@ -7,7 +7,7 @@ import com.ym.mec.common.enums.BaseEnum;
  */
 public enum ClassGroupTypeEnum implements BaseEnum<String, ClassGroupTypeEnum> {
 	NORMAL("NORMAL", "普通班级"), MIX("MIX", "合奏班级"), HIGH("HIGH", "提高班"), VIP("VIP", "vip课"), DEMO("DEMO", "试听课"), PRACTICE("PRACTICE", "网管课"), SNAP("SNAP",
-			"临时班级"), COMM("COMM", "对外课程"), HIGH_ONLINE("HIGH_ONLINE", "线上小班课");
+			"临时班级"), COMM("COMM", "对外课程"), HIGH_ONLINE("HIGH_ONLINE", "线上基础技能课"),MUSIC_NETWORK("MUSIC_NETWORK","乐团网管课");
 
 	private String code;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/ComplaintsStatusEnum.java

@@ -0,0 +1,39 @@
+package com.ym.mec.biz.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+/**
+ * '申述状态0拒绝1通过2待处理3已撤销
+ */
+public enum ComplaintsStatusEnum implements BaseEnum<Integer, ComplaintsStatusEnum> {
+	REJECT(0, "拒绝"),
+	PASS(1, "通过"),
+	WAIT(2, "待处理"),
+	REPEAL(3, "撤销");
+
+	private Integer code;
+
+	private String msg;
+
+	ComplaintsStatusEnum(Integer code, String msg) {
+		this.code = code;
+		this.msg = msg;
+	}
+
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	@Override
+	public Integer getCode() {
+		return this.code;
+	}
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/GroupType.java

@@ -3,7 +3,14 @@ package com.ym.mec.biz.dal.enums;
 import com.ym.mec.common.enums.BaseEnum;
 
 public enum GroupType implements BaseEnum<String, GroupType> {
-	MUSIC("乐团课"), VIP("VIP课"), DEMO("试听课"), SPORADIC("零星收费"), PRACTICE("网管课"), COMM("对外课程"),REPAIR("乐器维修");
+	MUSIC("乐团课"),
+	VIP("VIP课"),
+	DEMO("试听课"),
+	SPORADIC("零星收费"),
+	PRACTICE("网管课"),
+	COMM("对外课程"),
+	REPAIR("乐器维修"),
+	OUTORDER("外部订单");
 
 	private String desc;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/MessageTypeEnum.java

@@ -40,6 +40,8 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     PUSH_TEACHER_COURSE_COLLIDE("PUSH_TEACHER_COURSE_COLLIDE", "课程冲突"),
     PAY_PRACTICE_BUY_SUCCESS("PAY_PRACTICE_BUY_SUCCESS", "网管课购买成功"),
     PRACTICE_COMPLETED_STUDY_REPORT("PRACTICE_COMPLETED_STUDY_REPORT", "网管课完成学习报告"),
+    PRACTICE_RENEW_REMIND_PUSH("PRACTICE_RENEW_REMIND_PUSH", "网管课续费推送"),
+    PUBLIC_EXTRA_REMIND("PUBLIC_EXTRA_REMIND", "本周应布置课外训练"),
     FREE_PRACTICE_APPLY_PUSH("FREE_PRACTICE_APPLY_PUSH", "免费陪练课预约推送"),
     STUDENT_PUSH_NAMES_ACHIEVE("STUDENT_PUSH_NAMES_ACHIEVE", "点名完成"),
     SCHEDULE_CHANGE("SCHEDULE_CHANGE", "课表变动"),
@@ -62,6 +64,10 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     TRIAL_PRACTICE_CREATE_STUDENT_PUSH("TRIAL_PRACTICE_CREATE_STUDENT_PUSH", "试听课安排"),
     TRIAL_PRACTICE_CREATE_TEACHER_PUSH("TRIAL_PRACTICE_CREATE_TEACHER_PUSH", "试听课安排"),
 
+    /**乐团网管课*/
+    MUSIC_NETWORK_CRATE_TEACHER("MUSIC_NETWORK_CRATE_TEACHER", "乐团网管课安排"),
+    MUSIC_NETWORK_CRATE_STUDENT("MUSIC_NETWORK_CRATE_STUDENT", "乐团课通知"),
+
     /** 课外训练消息 */
     EXTRA_REMIND_PUSH("EXTRA_REMIND_PUSH", "作业提醒"),
     EXTRA_REMIND_IM("EXTRA_REMIND_IM", "作业提醒"),
@@ -86,12 +92,14 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     TEACHER_PUSH_NAMES_MESSAGE("TEACHER_PUSH_NAMES_MESSAGE", "点名提醒"),
     TEACHER_PUSH_SIGN_OUT_MESSAGE("TEACHER_PUSH_SIGN_OUT_MESSAGE", "签退提醒"),
     TEACHER_PUSH_JOB_WAIT_REPLY("TEACHER_PUSH_JOB_WAIT_REPLY", "作业待回复"),
+    TEACHER_ATTENDANCE_COMPLAINTS_RESULT("TEACHER_ATTENDANCE_COMPLAINTS_RESULT", "考勤申述结果"),
     TEACHER_PUSH_SUBSTITUTE_PLAN("TEACHER_PUSH_SUBSTITUTE_PLAN", "代课安排"),
     TEACHER_PUSH_LEAVE_RESULT("TEACHER_PUSH_LEAVE_RESULT", "请假结果"),
     TEACHER_PUSH_COURSE_SCHEDULE_CHANGE_RESULT("TEACHER_PUSH_COURSE_SCHEDULE_CHANGE_RESULT", "课时调整结果"),
     TEACHER_PUSH_STUDENT_LEAVE("TEACHER_PUSH_STUDENT_LEAVE", "学员请假"),
     TEACHER_PUSH_CLASS_MESSAGE("TEACHER_PUSH_CLASS_MESSAGE", "班级消息"),
     COURSE_SALARY_COMPLAINTS_RESULT("COURSE_SALARY_COMPLAINTS_RESULT", "课酬申述结果"),
+    PUSH_TEACHER_EXCEPTION_ATTENDANCE("PUSH_TEACHER_EXCEPTION_ATTENDANCE", "异常考勤通知"),
 
     EDUCATION_PUSH_MUSIC_GROUP_FOUND("EDUCATION_PUSH_MUSIC_GROUP_FOUND", "乐团成立"),
     EDUCATION_PUSH_MUSIC_GROUP_CLOSE("EDUCATION_PUSH_MUSIC_GROUP_CLOSE", "乐团关闭"),

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/PaymentStatusEnum.java

@@ -11,7 +11,7 @@ public enum PaymentStatusEnum implements BaseEnum<Integer, PaymentStatusEnum> {
 
 	private String desc;
 
-	private PaymentStatusEnum(Integer code, String desc) {
+	PaymentStatusEnum(Integer code, String desc) {
 		this.code = code;
 		this.desc = desc;
 	}