Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow into zouxuan

 Conflicts:

	cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/CourseScheduleStudentPaymentDao.java

	cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/CourseScheduleStudentPaymentService.java

	cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseScheduleStudentPaymentServiceImpl.java

	cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

	cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleStudentPaymentMapper.xml

.gitignore

@@ -53,3 +53,7 @@ target
 *.classpath
 /bin/
 **/bootstrap-local.yml
+**/bootstrap-local.properties
+**/logback-spring.xml
+/.gitignore
+/.gitignore

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysMenu.java

@@ -63,7 +63,7 @@ public class SysMenu {
 
 	/** 逻辑删除标记(0--正常 1--删除) */
 	@ApiModelProperty(value = "逻辑删除标记(0--正常 1--删除)",required = false)
-	private Boolean delFlag;
+	private Boolean delFlag= false;
 
 	private Integer hid;
 	

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysRole.java

@@ -37,7 +37,7 @@ public class SysRole {
 	
 	/** 删除标识（0-正常,1-删除） */
 	@ApiModelProperty(value = "删除标识（0-正常,1-删除）",required = false)
-	private Boolean delFlag;
+	private Boolean delFlag= false;
 
 	@ApiModelProperty(value = "菜单列表",required = false)
 	private List<Long> menuIds;

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysUser.java

@@ -25,22 +25,22 @@ public class SysUser implements Serializable{
 	private Long id;
 	
 	/** 用户名 */
-	@ApiModelProperty(value = "用户名",required = false)
+	@ApiModelProperty(value = "用户名")
 	private String username;
 
 	/**  */
-	@ApiModelProperty(value = "密码",required = false)
+	@ApiModelProperty(value = "密码")
 	private String password;
 
 	/** 随机盐 */
-	@ApiModelProperty(value = "随机盐",required = false)
+	@ApiModelProperty(value = "随机盐")
 	private String salt;
 
-	@ApiModelProperty(value = "手机号",required = false)
+	@ApiModelProperty(value = "手机号")
 	private String phone;
 
 	/** 头像 */
-	@ApiModelProperty(value = "头像",required = false)
+	@ApiModelProperty(value = "头像")
 	private String avatar;
 
 	/** 创建时间 */
@@ -50,54 +50,54 @@ public class SysUser implements Serializable{
 	private java.util.Date updateTime;
 
 	/** 0-正常，9-锁定 */
-	@ApiModelProperty(value = "0-正常，9-锁定",required = false)
+	@ApiModelProperty(value = "0-正常，9-锁定")
 	private Integer lockFlag;
 
 	/** 0-正常，1-删除 */
-	@ApiModelProperty(value = "0-正常，1-删除",required = false)
-	private Boolean delFlag;
+	@ApiModelProperty(value = "0-正常，1-删除")
+	private Boolean delFlag= false;
 
 	/** 微信openid */
-	@ApiModelProperty(value = "微信openid",required = false)
+	@ApiModelProperty(value = "微信openid")
 	private String wxOpenid;
 
 	/** QQ openid */
-	@ApiModelProperty(value = "QQ openid",required = false)
+	@ApiModelProperty(value = "QQ openid")
 	private String qqOpenid;
 
 	/** 用户类型 */
-//	@ApiModelProperty(value = "用户类型",required = false)
+//	@ApiModelProperty(value = "用户类型")
 	//STUDENT("学生"), EDU_TEACHER("教务老师"), TEACHER("指导老师"), SYSTEM("系统內置"), ADMIN("管理员")
 	private String userType;
 
-	@ApiModelProperty(value = "性别0女1男",required = false)
+	@ApiModelProperty(value = "性别0女1男")
 	private Integer gender;
 
-	@ApiModelProperty(value = "民族",required = false)
+	@ApiModelProperty(value = "民族")
 	private String nation;
 
-	@ApiModelProperty(value = "生日",required = false)
+	@ApiModelProperty(value = "生日")
 	private Date birthdate;
 
-	@ApiModelProperty(value = "邮箱",required = false)
+	@ApiModelProperty(value = "邮箱")
 	private String email;
 
-	@ApiModelProperty(value = "融云token",required = false)
+	@ApiModelProperty(value = "融云token")
 	private String imToken;
 
-	@ApiModelProperty(value = "身份证号",required = false)
+	@ApiModelProperty(value = "身份证号")
 	private String idCardNo;
 
-	@ApiModelProperty(value = "真实姓名",required = false)
+	@ApiModelProperty(value = "真实姓名")
 	private String realName;
 
-	@ApiModelProperty(value = "微信号",required = false)
+	@ApiModelProperty(value = "微信号")
 	private String wechatId;
 
-	@ApiModelProperty(value = "是否是超管",required = false)
+	@ApiModelProperty(value = "是否是超管")
 	private Boolean isSuperAdmin = false;
 
-	@ApiModelProperty(value = "用户角色",required = false)
+	@ApiModelProperty(value = "用户角色")
 	private List<Long> roles;
 
 	private String certificateType;

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysUserDevice.java

@@ -28,7 +28,7 @@ public class SysUserDevice {
 	
 	private String clientId;
 	
-	private Boolean delFlag;
+	private Boolean delFlag= false;
 	
 	private SysUser user;
 	

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -8,6 +8,7 @@ import com.yonge.cooleshow.common.constant.CommonConstants;
 import com.yonge.toolset.thirdparty.user.realname.RealnameAuthenticationPlugin;
 import com.yonge.toolset.utils.idcard.IdcardInfoExtractor;
 import com.yonge.toolset.utils.idcard.IdcardValidator;
+import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -322,7 +323,13 @@ public class UserController extends BaseController {
             if (sysUser.getBirthdate() != null && DateUtil.daysBetween(sysUser.getBirthdate(), date) <= 0) {
                 throw new BizException("出生日期不可超过当前时间");
             }
-
+            //手机号不能被占用
+            if(!StringUtil.isEmpty(sysUser.getPhone())){
+                SysUser newSysUser = sysUserService.queryByPhone(sysUser.getPhone());
+                if (newSysUser != null && !newSysUser.getId().equals(sysUser.getId())) {
+                    return failed("手机号被占用");
+                }
+            }
             sysUserService.updateBaseInfo(sysUser);
             return succeed();
         }

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/dao/SysConfigDao.java

@@ -9,7 +9,7 @@ public interface SysConfigDao extends BaseDAO<Long, SysConfig> {
      * @Author: Joburgess
      * @Date: 2019/10/9
      * @params [paramName]
-     * @return com.ym.mec.biz.dal.entity.SysConfig
+     * @return com.yonge.cooleshow.biz.dal.entity.SysConfig
      * @describe 根据配置名称获取配置信息
      */
     SysConfig findByParamName(String paramName);

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/entity/SysNewsInformation.java

@@ -65,7 +65,7 @@ public class SysNewsInformation {
 	@ApiModelProperty(value = "备注", required = false)
 	private String memo;
 
-	private Boolean delFlag;
+	private Boolean delFlag= false;
 
 	private Integer tenantId;
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/entity/SysNewsType.java

@@ -17,7 +17,7 @@ public class SysNewsType {
 	private Long parentId;
 	
 	/**  */
-	private boolean delFlag;
+	private Boolean delFlag= false;
 	
 	/**  */
 	private java.util.Date createTime;

cooleshow-cms/src/main/resources/logback-spring.xml

@@ -27,8 +27,15 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.ym.mec" level="INFO" />
+	<logger name="com.yonge.cooleshow" level="INFO" />
 
+	<!--本地环境:打印控制台 -->
+	<springProfile name="local">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
 	<!--开发环境:打印控制台 -->
 	<springProfile name="dev">
 		<root level="INFO">

cooleshow-common/pom.xml

@@ -63,6 +63,5 @@
 			<groupId>com.vdurmont</groupId>
 			<artifactId>emoji-java</artifactId>
 		</dependency>
-
 	</dependencies>
 </project>

cooleshow-common/src/main/java/com/yonge/cooleshow/common/redis/config/RedisConfig.java

@@ -30,7 +30,7 @@ public class RedisConfig {
 	private int database;
 
 	@Bean
-	public RedisConnectionFactory jedisConnectionFactory() {
+	public JedisConnectionFactory jedisConnectionFactory() {
 		RedisStandaloneConfiguration config = new RedisStandaloneConfiguration();
 		config.setHostName(host);
 		config.setPort(port);
@@ -44,7 +44,7 @@ public class RedisConfig {
 	}
 
 	@Bean
-	public RedisTemplate<String, Serializable> redisTemplate(JedisConnectionFactory connectionFactory) {
+	public RedisTemplate<String, Serializable> redisTemplate(JedisConnectionFactory jedisConnectionFactory) {
 		RedisTemplate<String, Serializable> redisTemplate = new RedisTemplate<>();
 
 		StringRedisSerializer stringSerializer = new StringRedisSerializer();
@@ -53,7 +53,7 @@ public class RedisConfig {
 		redisTemplate.setHashKeySerializer(stringSerializer);
 		redisTemplate.setValueSerializer(new JdkSerializationRedisSerializer());
 		redisTemplate.setHashValueSerializer(new JdkSerializationRedisSerializer());
-		redisTemplate.setConnectionFactory(jedisConnectionFactory());
+		redisTemplate.setConnectionFactory(jedisConnectionFactory);
 		return redisTemplate;
 	}
 

cooleshow-gateway/gateway-web/src/main/resources/logback-spring.xml

@@ -27,8 +27,15 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.ym.mec" level="INFO" />
+	<logger name="com.yonge.cooleshow" level="INFO" />
 
+	<!--本地环境:打印控制台 -->
+	<springProfile name="local">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
 	<!--开发环境:打印控制台 -->
 	<springProfile name="dev">
 		<root level="INFO">

cooleshow-task/src/main/resources/logback-spring.xml

@@ -27,11 +27,18 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.ym.mec" level="debug" />
+	<logger name="com.yonge.cooleshow" level="debug" />
 
+	<!--本地环境:打印控制台 -->
+	<springProfile name="local">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
 	<!--开发环境:打印控制台 -->
 	<springProfile name="dev">
-		<root level="info">
+		<root level="INFO">
 			<appender-ref ref="stdout" />
 			<appender-ref ref="file" />
 		</root>

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/EmployeeController.java

@@ -1,10 +1,16 @@
 package com.yonge.cooleshow.admin.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.EmployeeDao;
+import com.yonge.cooleshow.biz.dal.dto.EmployeeDto;
 import com.yonge.cooleshow.biz.dal.dto.search.EmployeeSearch;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.biz.dal.dto.search.StudentSearch;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
+import com.yonge.cooleshow.biz.dal.vo.EmployeeVo;
+import com.yonge.cooleshow.biz.dal.vo.StudentVo;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
 import io.swagger.annotations.Api;
@@ -14,18 +20,17 @@ import io.swagger.annotations.ApiOperation;
 
 import java.util.Date;
 
+import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.yonge.cooleshow.biz.dal.entity.Employee;
 import com.yonge.cooleshow.biz.dal.service.EmployeeService;
 import com.yonge.cooleshow.common.controller.BaseController;
 
+import javax.validation.Valid;
+
 @RequestMapping("employee")
 @Api(tags = "员工管理")
 @RestController
@@ -37,58 +42,54 @@ public class EmployeeController extends BaseController {
     @Autowired
     private EmployeeDao employeeDao;
 
-    @GetMapping("/detail/{userId}")
+    @GetMapping("/detail/{id}")
     @ApiOperation(value = "详情", notes = "传入student")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "userId", value = "userId", paramType = "path", dataType = "long", required = true),
+            @ApiImplicitParam(name = "id", value = "id", paramType = "path", dataType = "long", required = true),
     })
-    public HttpResponseResult<Employee> detail(Long userId){
-        Employee detail = employeeService.detail(userId);
+    public HttpResponseResult<EmployeeVo> detail(@PathVariable("id") Long id){
+        EmployeeVo detail = employeeService.detail(id);
         return succeed(detail);
     }
 
-    @PostMapping("/page")
+    /**
+     * 查询分页
+     */
     @ApiOperation(value = "查询分页", notes = "传入student")
-    public HttpResponseResult<PageInfo<Employee>> page(@RequestBody EmployeeSearch query) {
-        return succeed(employeeService.selectPage(query, query));
+    @PostMapping("/page")
+    @PreAuthorize("@pcs.hasPermissions('employee/page')")
+    public HttpResponseResult<PageInfo<EmployeeVo>> page(@RequestBody EmployeeSearch query) {
+        query.setSort("id_");
+        IPage<EmployeeVo> pages = employeeService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
     }
 
     @ApiOperation(value = "新增员工")
     @PostMapping("/add")
     @PreAuthorize("@pcs.hasPermissions('employee/add')")
-    public Object add(@RequestBody Employee employee) throws Exception {
+    public HttpResponseResult<EmployeeDto> add(@Valid @RequestBody EmployeeDto employee) throws Exception {
         employee.setCreateTime(new Date());
         employee.setUpdateTime(new Date());
-        employeeService.add(employee);
-        return succeed();
+        return employeeService.addEmployee(employee);
     }
 
     @ApiOperation(value = "修改员工")
     @PostMapping("/update")
     @PreAuthorize("@pcs.hasPermissions('employee/update')")
-    public Object update(@RequestBody Employee employee) throws Exception{
+    public HttpResponseResult<EmployeeDto> update(@Valid @RequestBody EmployeeDto employee) throws Exception{
         employee.setUpdateTime(new Date());
-        employeeService.updateEmployee(employee);
-        return succeed();
+        return employeeService.updateEmployee(employee);
     }
 
-    /*@ApiOperation(value = "获取所有员工")
-    @GetMapping("/findAll")
-    @PreAuthorize("@pcs.hasPermissions('employee/findAll')")
-    public Object findAll() {
-        return succeed(employeeService.findAll(null));
-    }*/
-
     @ApiOperation(value = "获取用户信息")
     @GetMapping("/queryUserInfo")
-    public Object apiQueryUserInfo() {
+    public HttpResponseResult<EmployeeVo> apiQueryUserInfo() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser != null && sysUser.getId() != null){
             Employee employee = employeeService.get(sysUser.getId());
-            employee.setRoles(employeeDao.queryUserRole(sysUser.getId()));
-            employee.setContactAddress(employee.getContactAddress());
-
-            return succeed(employee);
+            EmployeeVo employeeVo = new EmployeeVo().buildVo(employee);
+            employeeVo.setRoleIds(employeeDao.queryUserRole(sysUser.getId()));
+            return succeed(employeeVo);
         }
         return failed("获取用户信息失败");
     }

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MusicAlbumController.java

@@ -1,28 +1,25 @@
 package com.yonge.cooleshow.admin.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-
-import javax.validation.Valid;
-
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumDetailSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumSearch;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
+import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.AlbumDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.*;
-import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import com.yonge.cooleshow.common.controller.BaseController;
-import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
-import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.Date;
 
 /**
@@ -45,34 +42,32 @@ public class MusicAlbumController extends BaseController {
     @PostMapping(value="/create", consumes="application/json", produces="application/json")
     public HttpResponseResult<Object> create(@Valid @RequestBody MusicAlbum musicAlbum) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
 
         musicAlbum.setCreateBy(sysUser.getId());
         musicAlbum.setCreateTime(new Date());
-        musicAlbum.setAlbumStatus(StateEnum.STOP);
-        musicAlbumService.createMusicAlbum(musicAlbum);
-        return succeed();
+        musicAlbum.setAlbumStatus(YesOrNoEnum.NO);
+        return succeed(musicAlbumService.createMusicAlbum(musicAlbum));
     }
 
     @ApiOperation(value = "删除", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping("/delete/{id}")
     public Object delete(@PathVariable Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
 
-        musicAlbumService.removeById(id);
-        return succeed();
+        return succeed(musicAlbumService.removeById(id));
     }
 
     @ApiOperation(value = "修改", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping(value="/update", consumes="application/json", produces="application/json")
     public HttpResponseResult<Object> update(@Valid @RequestBody MusicAlbum musicAlbum) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
         if (musicAlbum.getId()==null){
@@ -81,15 +76,14 @@ public class MusicAlbumController extends BaseController {
 
         musicAlbum.setUpdateBy(sysUser.getId());
         musicAlbum.setUpdateTime(new Date());
-        musicAlbumService.updateMusicAlbum(musicAlbum);
-        return succeed();
+        return succeed(musicAlbumService.updateMusicAlbum(musicAlbum));
     }
 
     @ApiOperation(value = "分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping(value="/list", consumes="application/json", produces="application/json")
     public HttpResponseResult<PageInfo<MusicAlbumVo>> list(@RequestBody MusicAlbumSearch query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
         IPage<MusicAlbumVo> iPage = musicAlbumService.selectPage(PageUtil.getPage(query),query);
@@ -112,8 +106,8 @@ public class MusicAlbumController extends BaseController {
     /**
      * 专辑详情
      */
-    @PostMapping("/detail")
-    @ApiOperation(value = "专辑详情", consumes="application/json", produces="application/json")
+    @PostMapping(value = "/detail", consumes="application/json", produces="application/json")
+    @ApiOperation(value = "专辑详情",  httpMethod="POST", consumes="application/json", produces="application/json")
     public HttpResponseResult<AlbumDetailVo> detail(@Valid @RequestBody MusicAlbumDetailSearch query) {
 
         query.setType(2);
@@ -125,12 +119,12 @@ public class MusicAlbumController extends BaseController {
     /**
      * 专辑详情能新增的曲目列表
      */
-    @PostMapping("/detail/canAddMusicSheet")
-    @ApiOperation(value = "专辑详情能新增的曲目列表")
+    @PostMapping(value = "/detail/canAddMusicSheet", consumes="application/json", produces="application/json")
+    @ApiOperation(value = "专辑详情能新增的曲目列表",  httpMethod="POST", consumes="application/json", produces="application/json")
     public HttpResponseResult<AlbumDetailVo> detailAddMusicSheet(@Valid @RequestBody MusicAlbumDetailSearch query) {
 
         query.setType(1);
-        query.setState(StateEnum.ENABLE);
+        query.setState(YesOrNoEnum.YES);
         AlbumDetailVo albumDetailVo = musicAlbumService.detail(PageUtil.getPage(query),query);
         return succeed(albumDetailVo);
     }
@@ -168,7 +162,7 @@ public class MusicAlbumController extends BaseController {
     })
     public HttpResponseResult<Boolean> detailAddMusicSheet(Long albumId, String musicSheetIds) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
         if (StringUtil.isEmpty(albumId)) {

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MusicSheetController.java

@@ -5,17 +5,20 @@ import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.auth.api.enums.SysUserType;
 import com.yonge.cooleshow.biz.dal.dto.MusicSheetDto;
+import com.yonge.cooleshow.biz.dal.dto.req.TeacherMusicSheetAuditReq;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
+import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetOrderSearch;
+import com.yonge.cooleshow.biz.dal.dto.search.TeacherMusicSheetAuditSearch;
+import com.yonge.cooleshow.biz.dal.dto.search.TeacherMusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
-import com.yonge.cooleshow.biz.dal.enums.AudioTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
-import com.yonge.cooleshow.biz.dal.enums.ChargeTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
+import com.yonge.cooleshow.biz.dal.enums.*;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
-import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
+import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
+import com.yonge.cooleshow.biz.dal.vo.StudentMusicSheetOrderVo;
+import com.yonge.cooleshow.biz.dal.vo.TeacherMusicSheetVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
@@ -53,10 +56,10 @@ public class MusicSheetController extends BaseController {
      * 查询单条
      */
     @GetMapping("/detail/{id}")
-    @ApiOperation(value = "详情", notes = "传入musicTag")
+    @ApiOperation(value = "详情", notes = "传入id")
     public HttpResponseResult<MusicSheetDetailVo> detail(@ApiParam(value = "曲谱编号", required = true) @PathVariable("id") Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
         return succeed(musicSheetService.detail(id, sysUser, SysUserType.SYSTEM));
@@ -66,7 +69,7 @@ public class MusicSheetController extends BaseController {
     @PostMapping(value="/create", consumes="application/json", produces="application/json")
     public HttpResponseResult<Object> create(@Valid @RequestBody MusicSheetDto musicSheetDto) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
 
@@ -79,6 +82,8 @@ public class MusicSheetController extends BaseController {
         }
 
         musicSheetDto.setUserId(0L);
+        musicSheetDto.setAuditStatus(AuthStatusEnum.PASS);
+        musicSheetDto.setDelFlag(false);
         List<MusicSheetAccompaniment> list;
         if (!AudioTypeEnum.MIDI.getCode().equals(musicSheetDto.getAudioType().getCode())){
             list = musicSheetDto.getBackground();
@@ -89,10 +94,9 @@ public class MusicSheetController extends BaseController {
         } else {
             MusicSheet musicSheet = new MusicSheet();
             BeanUtils.copyProperties(musicSheetDto, musicSheet);
-            musicSheet.setAuditStatus(AuditEnum.AUDITING);
             musicSheet.setCreateBy(sysUser.getId());
             musicSheet.setCreateTime(new Date());
-            musicSheet.setState(StateEnum.STOP);
+            musicSheet.setState(YesOrNoEnum.NO);
             musicSheetService.save(musicSheet);
         }
 
@@ -104,11 +108,11 @@ public class MusicSheetController extends BaseController {
     @PostMapping("/delete/{id}")
     public Object delete(@PathVariable Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
 
-        boolean result = musicSheetService.removeById(id);
+        boolean result = musicSheetService.del(id);
         if (result){
             return succeed("删除成功");
         } else {
@@ -120,7 +124,7 @@ public class MusicSheetController extends BaseController {
     @PostMapping(value="/update", consumes="application/json", produces="application/json")
     public HttpResponseResult<Object> update(@Valid @RequestBody MusicSheet musicSheet) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
         if (musicSheet.getId()==null){
@@ -141,7 +145,7 @@ public class MusicSheetController extends BaseController {
     @PostMapping(value="/list", consumes="application/json", produces="application/json")
     public HttpResponseResult<PageInfo<MusicSheetVo>> list(@RequestBody MusicSheetSearch query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
 
@@ -161,4 +165,45 @@ public class MusicSheetController extends BaseController {
         }
         return status(musicSheetService.state(id));
     }
+
+    /**
+     * 学生详情-乐谱
+     */
+    @PostMapping(value = "/student", consumes="application/json", produces="application/json")
+    @ApiOperation(value = "学生详情-乐谱", httpMethod="POST", consumes="application/json", produces="application/json")
+    public HttpResponseResult<PageInfo<StudentMusicSheetOrderVo>> student(@Valid @RequestBody StudentMusicSheetOrderSearch query) {
+        return succeed(PageUtil.pageInfo(musicSheetService.selectStudentOrderPage(PageUtil.getPage(query),query)));
+    }
+
+
+    /**
+     * 老师详情-乐谱
+     */
+    @PostMapping(value = "/teacher", consumes="application/json", produces="application/json")
+    @ApiOperation(value = "老师详情-乐谱", httpMethod="POST", consumes="application/json", produces="application/json")
+    public HttpResponseResult<PageInfo<TeacherMusicSheetVo>> teacher(@Valid @RequestBody TeacherMusicSheetSearch query) {
+        return succeed(PageUtil.pageInfo(musicSheetService.selectTeacherPage(PageUtil.getPage(query),query)));
+    }
+
+    /**
+     * 审核中心-乐谱审核列表
+     */
+    @PostMapping(value = "/audit/list", consumes="application/json", produces="application/json")
+    @ApiOperation(value = "审核中心-乐谱审核列表", httpMethod="POST", consumes="application/json", produces="application/json")
+    public HttpResponseResult<PageInfo<TeacherMusicSheetVo>> audit(@RequestBody TeacherMusicSheetAuditSearch query) {
+        return succeed(PageUtil.pageInfo(musicSheetService.selectAuditPage(PageUtil.getPage(query),query)));
+    }
+
+    /**
+     * 审核中心-乐谱审核
+     */
+    @PostMapping(value = "/audit", consumes="application/json", produces="application/json")
+    @ApiOperation(value = "审核中心-乐谱审核", httpMethod="POST", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Boolean> audit(@Valid @RequestBody TeacherMusicSheetAuditReq param) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null  || sysUser.getId() == null) {
+            return failed("用户信息获取失败");
+        }
+        return status(musicSheetService.audit(param,sysUser.getId()));
+    }
 }

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MusicTagController.java

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
 
 @RestController
@@ -31,7 +32,7 @@ public class MusicTagController extends BaseController {
      * 查询单条
      */
     @GetMapping("/detail/{id}")
-    @ApiOperation(value = "详情", notes = "传入musicTag")
+	@ApiOperation(value = "详情", notes = "传入id")
     public HttpResponseResult<MusicTagVo> detail(@ApiParam(value = "标签编号", required = true) @PathVariable("id") Long id) {
     	return succeed(musicTagService.detail(id));
 	}
@@ -39,9 +40,9 @@ public class MusicTagController extends BaseController {
     /**
      * 查询分页tree
      */
-    @GetMapping("/page")
-    @ApiOperation(value = "查询分页", notes = "传入musicTag")
-    public HttpResponseResult<PageInfo<MusicTagVo>> page(MusicTagSearch query) {
+    @PostMapping(value = "/page", consumes="application/json", produces="application/json")
+    @ApiOperation(value = "查询分页", httpMethod="POST", consumes="application/json", produces="application/json")
+    public HttpResponseResult<PageInfo<MusicTagVo>> page(@Valid @RequestBody MusicTagSearch query) {
 		IPage<MusicTagVo> pages = musicTagService.selectPage(PageUtil.getPage(query), query);
 		return succeed(PageUtil.pageInfo(pages));
 	}
@@ -51,7 +52,7 @@ public class MusicTagController extends BaseController {
 	 * 查询分页tree
 	 */
 	@GetMapping("/tree")
-	@ApiOperation(value = "查询标签树列表", notes = "传入musicTag")
+	@ApiOperation(value = "查询标签树列表")
 	public HttpResponseResult<List<MusicTagVo>> tree() {
 		List<MusicTagVo> treeList = musicTagService.selectMusicTagTree();
 		return succeed(treeList);
@@ -60,21 +61,19 @@ public class MusicTagController extends BaseController {
     /**
 	 * 新增
 	 */
-	@PostMapping("/save")
-	@ApiOperation(value = "新增", notes = "传入musicTag")
+	@PostMapping(value = "/save",  consumes="application/json", produces="application/json")
+	@ApiOperation(value = "新增", httpMethod="POST", consumes="application/json", produces="application/json")
 	public HttpResponseResult<Boolean> save(@Validated(MusicTagSaveDto.Create.class) @RequestBody MusicTagSaveDto musicTagSaveDto) {
-		musicTagService.createMusicTag(musicTagSaveDto);
-		return succeed();
+		return succeed(musicTagService.createMusicTag(musicTagSaveDto));
 	}
 
     /**
 	 * 修改
 	 */
-	@PostMapping("/update")
-	@ApiOperation(value = "修改", notes = "传入musicTag")
+	@PostMapping(value =  "/update",  consumes="application/json", produces="application/json")
+	@ApiOperation(value = "修改", httpMethod="POST", consumes="application/json", produces="application/json")
 	public HttpResponseResult<Boolean> update(@Validated(MusicTagSaveDto.Update.class) @RequestBody MusicTagSaveDto musicTagSaveDto) {
-		musicTagService.updateMusicTag(musicTagSaveDto);
-		return succeed();
+		return succeed(musicTagService.updateMusicTag(musicTagSaveDto));
 	}
 
  	/**

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/StudentController.java

@@ -18,9 +18,7 @@ import org.springframework.web.bind.annotation.*;
 public class StudentController extends BaseController {
     @Autowired
     private StudentService studentService;
-	/**
-     * 查询单条
-     */
+
     @GetMapping("/detail/{id}")
     @ApiOperation(value = "详情", notes = "传入id")
     @ApiImplicitParams({
@@ -31,11 +29,8 @@ public class StudentController extends BaseController {
 		return succeed(detail);
 	}
 
-    /**
-     * 查询分页
-     */
     @PostMapping("/page")
-    @ApiOperation(value = "查询分页", notes = "传入student")
+    @ApiOperation(value = "查询分页", notes = "传入StudentSearch")
     public HttpResponseResult<PageInfo<StudentVo>> page(@RequestBody StudentSearch query) {
 		IPage<StudentVo> pages = studentService.selectPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/SubjectController.java

@@ -31,14 +31,6 @@ public class SubjectController extends BaseController {
 	@Autowired
 	private SubjectService subjectService;
 
-	@ApiOperation(value = "修改、新增科目")
-	@PostMapping("/upset")
-	@PreAuthorize("@pcs.hasPermissions('subject/upset')")
-	public Object update(@RequestBody Subject subject) {
-		subjectService.upSetSubject(subject);
-		return succeed();
-	}
-
 	@ApiOperation(value = "根据科目编号查询科目")
 	@GetMapping("/get/{id}")
 	@PreAuthorize("@pcs.hasPermissions('subject/get')")
@@ -46,14 +38,6 @@ public class SubjectController extends BaseController {
 		return succeed(subjectService.get(id));
 	}
 
-	@ApiOperation(value = "删除指定科目")
-	@PostMapping("/delete/{id}")
-	@PreAuthorize("@pcs.hasPermissions('subject/get')")
-	public HttpResponseResult<Subject> delete(@ApiParam(value = "科目编号", required = true) @PathVariable("id") Long id) {
-		subjectService.deleteById(id);
-		return succeed();
-	}
-
 	@ApiOperation(value = "分页查询科目列表")
 	@GetMapping("/queryPage")
 	@PreAuthorize("@pcs.hasPermissions('subject/queryPage')")
@@ -64,13 +48,10 @@ public class SubjectController extends BaseController {
 				.collect(Collectors.toMap(Subject::getId, t -> t));
 
 		pageInfo.getRows().forEach(row -> {
-
 			if(row.getParentSubjectId() != null && row.getParentSubjectId() > 0) {
 				row.setParentSubjectName(map.get(row.getParentSubjectId()).getName());
 			}
-
 		});
-
 		return succeed(pageInfo);
 	}
 
@@ -80,4 +61,20 @@ public class SubjectController extends BaseController {
 	public HttpResponseResult<PageInfo<Subject>> queryPageTree(SubjectQueryInfo queryInfo) {
 		return succeed(subjectService.queryPageTree(queryInfo));
 	}
+
+	@ApiOperation(value = "修改、新增科目")
+	@PostMapping("/upset")
+	@PreAuthorize("@pcs.hasPermissions('subject/upset')")
+	public Object update(@RequestBody Subject subject) {
+		subjectService.upSetSubject(subject);
+		return succeed();
+	}
+
+	@ApiOperation(value = "删除指定科目")
+	@PostMapping("/delete/{id}")
+	@PreAuthorize("@pcs.hasPermissions('subject/get')")
+	public HttpResponseResult<Subject> delete(@ApiParam(value = "科目编号", required = true) @PathVariable("id") Long id) {
+		subjectService.deleteById(id);
+		return succeed();
+	}
 }

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TeacherAuthEntryRecordController.java

@@ -27,9 +27,6 @@ public class TeacherAuthEntryRecordController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;
 
-    /**
-     * 查询单条详情
-     */
     @GetMapping("/detail/{id}")
     @ApiOperation(value = "详情", notes = "传入id")
     @ApiImplicitParams({
@@ -40,11 +37,8 @@ public class TeacherAuthEntryRecordController extends BaseController {
         return succeed(detail);
     }
 
-    /**
-     * 查询分页
-     */
     @PostMapping("/page")
-    @ApiOperation(value = "查询分页", notes = "传入teacherAuthEntryRecord")
+    @ApiOperation(value = "查询分页", notes = "传入AuthEntryRecordSearch")
     public HttpResponseResult<PageInfo<TeacherAuthEntryRecordVo>> page(@RequestBody AuthEntryRecordSearch search) {
         IPage<TeacherAuthEntryRecordVo> pages = teacherAuthEntryRecordService.selectPage(PageUtil.getPage(search), search);
         return succeed(PageUtil.pageInfo(pages));
@@ -57,9 +51,6 @@ public class TeacherAuthEntryRecordController extends BaseController {
         return teacherAuthEntryRecordService.doAuth(authOperaReq, sysUser);
     }
 
-    /**
-     * 删除
-     */
     @PostMapping("/remove")
     @ApiOperation(value = "删除", notes = "传入ids")
     public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TeacherAuthMusicianRecordController.java

@@ -22,7 +22,6 @@ import javax.validation.Valid;
 @RequestMapping("/teacherAuthMusicianRecord")
 @Api(value = "老师音乐人审核表", tags = "老师音乐人审核表")
 public class TeacherAuthMusicianRecordController extends BaseController {
-
     @Autowired
     private TeacherAuthMusicianRecordService teacherAuthMusicianRecordService;
 	@Autowired

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/VideoLessonController.java

@@ -0,0 +1,80 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonSearch;
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
+import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupDetailService;
+import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupService;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
+import com.yonge.cooleshow.biz.dal.valid.AddGroup;
+import com.yonge.cooleshow.biz.dal.valid.SelectGroup;
+import com.yonge.cooleshow.biz.dal.vo.VideoLessonPurchaseVo;
+import com.yonge.cooleshow.biz.dal.vo.VideoLessonStudentDetailVo;
+import com.yonge.cooleshow.biz.dal.vo.VideoLessonTeacherVo;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.page.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Author: cy
+ * @Date: 2022/4/2
+ */
+@RestController
+@RequestMapping("/videoLesson")
+@Api(tags = "视频课")
+@Validated
+public class VideoLessonController extends BaseController {
+    @Autowired
+    private VideoLessonGroupService lessonGroupService;
+    @Autowired
+    private VideoLessonGroupDetailService videoLessonGroupDetailService;
+
+    /**
+     * @Description: 学员详情-查询视频课列表
+     * @Author: cy
+     * @Date: 2022/4/2
+     */
+    @ApiOperation(value = "学员详情-查询视频课列表")
+    @PostMapping(value = "/student")
+    public HttpResponseResult<PageInfo<VideoLessonStudentDetailVo>> selectStudentPage(@Validated(AddGroup.class) @RequestBody VideoLessonSearch search) {
+        return succeed(PageUtil.pageInfo(lessonGroupService.selectStudentPage(PageUtil.getPage(search), search)));
+    }
+
+    /**
+     * @Description: 老师详情-查询视频课列表
+     * @Author: cy
+     * @Date: 2022/4/6
+     */
+    @ApiOperation(value = "老师详情-查询视频课列表")
+    @PostMapping(value = "/teacher")
+    public HttpResponseResult<PageInfo<VideoLessonTeacherVo>> selectTeacherPage(@Validated(AddGroup.class) @RequestBody VideoLessonSearch search) {
+        return succeed(PageUtil.pageInfo(lessonGroupService.selectTeacherPage(PageUtil.getPage(search), search)));
+    }
+
+    /**
+     * @Description: 老师详情-视频课详情-查询购买学员列表
+     * @Author: cy
+     * @Date: 2022/4/6
+     */
+    @ApiOperation(value = "老师详情-视频课详情-查询购买学员列表", httpMethod = "POST", consumes = "application/json", produces = "application/json")
+    @PostMapping(value = "/teacher/purchaseStudent", consumes = "application/json", produces = "application/json")
+    public HttpResponseResult<PageInfo<VideoLessonPurchaseVo>> selectPurchaseStudent(@Validated(SelectGroup.class) @RequestBody VideoLessonSearch search) {
+        return succeed(PageUtil.pageInfo(lessonGroupService.selectPurchaseStudent(PageUtil.getPage(search), search)));
+    }
+
+    /**
+     * @Description: 老师详情-视频课详情-教学计划
+     * @Author: cy
+     * @Date: 2022/4/6
+     */
+    @ApiOperation(value = "老师详情-视频课详情-教学计划", httpMethod = "POST", consumes = "application/json", produces = "application/json")
+    @PostMapping(value = "/teacher/plan", consumes = "application/json", produces = "application/json")
+    public HttpResponseResult<PageInfo<VideoLessonGroupDetail>> page(@Validated(SelectGroup.class) @RequestBody VideoLessonSearch search) {
+        return succeed(PageUtil.pageInfo(videoLessonGroupDetailService.selectPage(PageUtil.getPage(search), search)));
+    }
+}

cooleshow-user/user-admin/src/main/resources/logback-spring.xml

@@ -27,8 +27,15 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.ym.mec" level="INFO" />
+	<logger name="com.yonge.cooleshow" level="INFO" />
 
+	<!--本地环境:打印控制台 -->
+	<springProfile name="local">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
 	<!--开发环境:打印控制台 -->
 	<springProfile name="dev">
 		<root level="INFO">

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/constant/CourseConstant.java

@@ -3,7 +3,8 @@ package com.yonge.cooleshow.biz.dal.constant;
 public interface CourseConstant {
     /**
      * 未正式写入数据库的排课时间临时数据
-     * <p>用途将未写入数据库的排课数据写入缓存,然后生成日历及陪练课买课时校验课时将缓存时间拿出来比对</p>
+     * <p>用途将未写入数据库的排课数据写入缓存,然后生成日历及陪练课买课时校验课时将缓存时间拿出来比对
+     * <p>返回结果 List<CourseTimeEntity>
      */
     String LOCK_COURSE_TIME_INFO = "LOCK_COURSE_TIME_INFO";
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/CourseGroupDao.java

@@ -1,10 +1,13 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yonge.cooleshow.biz.dal.entity.CourseGroup;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 课程组表(CourseGroup)表数据库访问层
@@ -16,5 +19,10 @@ public interface CourseGroupDao extends BaseMapper<CourseGroup> {
 
     int insertBatch(@Param("entities") List<CourseGroup> entities);
 
+    /**
+     * 分页查询课程组信息
+     */
+    <T> IPage<T> queryTeacherCourseGroup(Page<T> page, @Param("param") Map<String, Object> param);
+
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/CoursePlanDao.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yonge.cooleshow.biz.dal.entity.CoursePlan;
+import com.yonge.cooleshow.biz.dal.vo.LiveCourseInfoVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -16,5 +17,10 @@ public interface CoursePlanDao extends BaseMapper<CoursePlan> {
 
     int insertBatch(@Param("entities") List<CoursePlan> entities);
 
+    /**
+     * 根据课程组id查询课程计划信息
+     */
+    List<LiveCourseInfoVo.PlanVo> queryCoursePlanByGroupId(@Param("groupId") Long groupId);
+
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/CourseScheduleDao.java

@@ -45,7 +45,7 @@ public interface CourseScheduleDao extends BaseMapper<CourseSchedule> {
      */
     List<CourseSchedule> queryStudentCourse(@Param("studentId") Long studentId, @Param("classDate") String classDate);
 
-    <T> IPage<T> queryTeacherCourse(Page<T> page, @Param("param") Map<String, Object> param);
+    <T> IPage<T> queryLiveTeacherCourse(Page<T> page, @Param("param") Map<String, Object> param);
 
     CourseSchedule findOne(@Param("courseScheduleId") Long courseScheduleId);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/CourseScheduleStudentPaymentDao.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yonge.cooleshow.biz.dal.entity.CourseScheduleStudentPayment;
+import com.yonge.cooleshow.biz.dal.vo.LiveCourseInfoVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,14 +19,22 @@ public interface CourseScheduleStudentPaymentDao extends BaseMapper<CourseSchedu
     int insertBatch(@Param("entities") List<CourseScheduleStudentPayment> entities);
 
     /**
-     * @description: 获取学员列表
      * @param courseGroupId
      * @param courseGroupType
      * @return java.util.List<java.lang.Long>
+     * @description: 获取学员列表
      * @author zx
      * @date 2022/3/23 16:18
      */
     Set<Long> queryStudentIds(@Param("courseGroupId") Long courseGroupId,
+                              @Param("courseGroupType") String courseGroupType);
+
+    /**
+     * 根据课程组id查询学员信息
+     *
+     * @param groupId 课程组id
+     */
+    List<LiveCourseInfoVo.CourseBuyStudentVo> queryStudentInfoByGroupId(@Param("groupId") Long groupId);
                                  @Param("courseGroupType") String courseGroupType);
 
     //重置节拍器设置

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/EmployeeDao.java

@@ -5,6 +5,9 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yonge.cooleshow.biz.dal.dto.search.EmployeeSearch;
+import com.yonge.cooleshow.biz.dal.dto.search.StudentSearch;
+import com.yonge.cooleshow.biz.dal.vo.EmployeeVo;
+import com.yonge.cooleshow.biz.dal.vo.StudentVo;
 import org.apache.ibatis.annotations.Param;
 
 import com.yonge.cooleshow.auth.api.entity.SysRole;
@@ -20,16 +23,16 @@ public interface EmployeeDao extends BaseDAO<Long, Employee> {
      * @updateTime 2022/3/25 13:36
      * @return: com.yonge.cooleshow.biz.dal.entity.Employee
      */
-    Employee detail(@Param("userId") Long userId);
-
+    EmployeeVo detail(@Param("id") Long id);
     /***
      * 平台用户管理分页查询
      * @author liweifan
-     * @param: userId
-     * @updateTime 2022/3/25 13:36
-     * @return: com.yonge.cooleshow.biz.dal.entity.Employee
+     * @param: page
+     * @param: employeeSearch
+     * @updateTime 2022/4/6 13:58
+     * @return: java.util.List<com.yonge.cooleshow.biz.dal.entity.Employee>
      */
-    IPage<Employee> queryPage(Page<Employee> pageInfo, @Param("param") EmployeeSearch employeeSearch);
+    List<EmployeeVo> selectPage(@Param("page") IPage page, @Param("param") EmployeeSearch employeeSearch);
 
     /***
      * 插入用户表
@@ -62,7 +65,7 @@ public interface EmployeeDao extends BaseDAO<Long, Employee> {
      * @param id
      * @param roleIds
      */
-    void batchAddEmployeeRole(@Param("userId") Long id, @Param("roleIds") List<Integer> roleIds);
+    void batchAddEmployeeRole(@Param("userId") Long id, @Param("roleIds") List<Long> roleIds);
 
     /***
      * 通过手机号查询用户

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/MusicSheetAuthRecordDao.java

@@ -0,0 +1,10 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yonge.cooleshow.biz.dal.entity.MusicSheetAuthRecord;
+
+
+public interface MusicSheetAuthRecordDao extends BaseMapper<MusicSheetAuthRecord>{
+
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/MusicSheetDao.java

@@ -2,12 +2,12 @@ package com.yonge.cooleshow.biz.dal.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumDetailSearch;
-import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
-import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetSearch;
+import com.yonge.cooleshow.biz.dal.dto.search.*;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
+import com.yonge.cooleshow.biz.dal.vo.StudentMusicSheetOrderVo;
+import com.yonge.cooleshow.biz.dal.vo.TeacherMusicSheetVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -77,6 +77,36 @@ public interface MusicSheetDao extends BaseMapper<MusicSheet> {
      * @param practiceMusicIdList 最近练习曲目id
      * @return list
      */
-    List<MusicSheetVo> selectPracticeMusicPage(@Param("param") StudentMusicSheetSearch query,
-                                               @Param("practiceMusicIdList") List<Long> practiceMusicIdList);
+    List<MusicSheetVo> selectPracticeMusicPage(@Param("param") StudentMusicSheetSearch query, @Param(
+            "practiceMusicIdList") List<Long> practiceMusicIdList);
+
+    /**
+     * 学生曲目购买信息
+     *
+     * @param page  分页
+     * @param query 查询条件
+     * @return list
+     */
+    List<StudentMusicSheetOrderVo> selectStudentOrderPage(@Param("page") IPage<StudentMusicSheetOrderVo> page, @Param(
+            "param") StudentMusicSheetOrderSearch query);
+
+    /**
+     * 老师曲目信息
+     *
+     * @param page  分页
+     * @param query 查询条件
+     * @return list
+     */
+    List<TeacherMusicSheetVo> selectTeacherPage(@Param("page") IPage<TeacherMusicSheetVo> page, @Param(
+            "param") TeacherMusicSheetSearch query);
+
+    /**
+     * 审核中心-乐谱审核
+     *
+     * @param page  分页
+     * @param query 查询条件
+     * @return list
+     */
+    List<TeacherMusicSheetVo> selectAuditPage(@Param("page") IPage<TeacherMusicSheetVo> page, @Param(
+            "param") TeacherMusicSheetAuditSearch query);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/MusicTagDao.java

@@ -1,14 +1,14 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
-import org.apache.ibatis.annotations.Param;
+import com.yonge.cooleshow.biz.dal.dto.search.MusicTagSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicTag;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.vo.MusicTagVo;
-import com.yonge.cooleshow.biz.dal.dto.search.MusicTagSearch;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 
 public interface MusicTagDao extends BaseMapper<MusicTag> {
@@ -38,7 +38,7 @@ public interface MusicTagDao extends BaseMapper<MusicTag> {
 	 * @param idAndName 标签编号/名称
 	 * @return List
 	 */
-	List<MusicTagVo> getChildren(@Param("id") Long id, @Param("state") StateEnum state, @Param("idAndName") String idAndName);
+	List<MusicTagVo> getChildren(@Param("id") Long id, @Param("state") YesOrNoEnum state, @Param("idAndName") String idAndName);
 
 
 	/**
@@ -48,5 +48,5 @@ public interface MusicTagDao extends BaseMapper<MusicTag> {
 	 * @param state    状态
 	 * @return 子集集合
 	 */
-	List<MusicTagVo> getChildrenByParentIdList(@Param("longList") List<Long> longList, @Param("state") StateEnum state);
+	List<MusicTagVo> getChildrenByParentIdList(@Param("longList") List<Long> longList, @Param("state") YesOrNoEnum state);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SubjectDao.java

@@ -10,27 +10,34 @@ import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.common.dal.BaseDAO;
 
 public interface SubjectDao extends BaseDAO<Long, Subject> {
-
-    /**
+    /***
+     * 通过id集合查询声部
+     * @param: subjectIds
+     * @updateTime 2022/4/6 11:37
+     * @return: java.util.List<com.yonge.cooleshow.biz.dal.entity.Subject>
+     */
+    List<Subject> findBySubjectIds(@Param("subjectIds") List<Long> subjectIds);
+    /***
+     * 通过声部id（字符串拼接）查询声部
+     * @param: subjectIdList
+     * @updateTime 2022/4/6 11:35
+     * @return: java.util.List<com.yonge.cooleshow.biz.dal.entity.Subject>
+     */
+    List<Subject> findBySubjectByIdList(@Param("subjectIdList") String subjectIdList);
+    /***
      * 根据父级id查询子级列表
-     *
-     * @param parentId
-     * @return
+     * @param: parentId
+     * @param: delFlag
+     * @updateTime 2022/4/6 11:40
+     * @return: java.util.List<com.yonge.cooleshow.biz.dal.entity.Subject>
      */
     List<Subject> findByParentId(@Param("parentId") Long parentId, @Param("delFlag") YesOrNoEnum delFlag);
-
-    /**
-     * 根据声部编号列表获取声部名称map
-     *
-     * @param subjectIds
-     * @return
+    /***
+     * 通过id删除
+     * @param: id
+     * @updateTime 2022/4/6 11:41
+     * @return: int
      */
-    List<Map<Long, String>> queryNameByIds(@Param("subjectIds") String subjectIds);
-
-    List<Subject> findBySubjectByIdList(@Param("subjectIdList") String subjectIdList);
-
-    List<Subject> findBySubjectIds(@Param("subjectIds") List<Long> subjectIds);
-    
     int deleteById(Long id);
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SysConfigDao.java

@@ -13,7 +13,7 @@ public interface SysConfigDao extends BaseDAO<Long, SysConfig> {
      * @Author: Joburgess
      * @Date: 2019/10/9
      * @params [paramName]
-     * @return com.ym.mec.biz.dal.entity.SysConfig
+     * @return com.yonge.cooleshow.biz.dal.entity.SysConfig
      * @describe 根据配置名称获取配置信息
      */
     SysConfig findByParamName(String paramName);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SysUserContractsDao.java

@@ -15,7 +15,7 @@ public interface SysUserContractsDao extends BaseDAO<Long, SysUserContracts> {
      * @date 2020.09.18
      * @param userId:
      * @param contractType:
-     * @return java.util.List<com.ym.mec.biz.dal.entity.SysUserContracts>
+     * @return java.util.List<com.yonge.cooleshow.biz.dal.entity.SysUserContracts>
      */
     List<SysUserContracts> getUserContractWithType(@Param("userId") Long userId,
                                                    @Param("contractType") SysUserContracts.ContractType contractType,

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/TeacherAuthEntryRecordDao.java

@@ -15,7 +15,7 @@ public interface TeacherAuthEntryRecordDao extends BaseMapper<TeacherAuthEntryRe
 	/**
 	 * 自定义分页
 	 */
-	List<TeacherAuthEntryRecordVo> selectPage(IPage page,@Param("param") AuthEntryRecordSearch search);
+	List<TeacherAuthEntryRecordVo> selectPage(@Param("page")IPage page,@Param("param") AuthEntryRecordSearch search);
 
 	/***
 	 * 修改用户实名信息

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/VideoLessonGroupDao.java

@@ -2,10 +2,10 @@ package com.yonge.cooleshow.biz.dal.dao;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonGroupSearch;
+import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonSearch;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupUpVo;
-import com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupVo;
+import com.yonge.cooleshow.biz.dal.vo.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,8 +18,17 @@ import java.util.List;
  **/
 public interface VideoLessonGroupDao extends BaseMapper<VideoLessonGroup> {
     //查询视频课组
-    List<VideoLessonGroupVo> selectPage(IPage page,@Param("param")  VideoLessonGroupSearch query);
+    List<VideoLessonGroupVo> selectPage(IPage page, @Param("param") VideoLessonGroupSearch query);
 
     //修改视频课组
     void updateGroup(VideoLessonGroupUpVo lessonGroupUpVo);
+
+    //学员详情-查询视频课列表
+    List<VideoLessonStudentDetailVo> selectStudentPage(IPage page, @Param("param") VideoLessonSearch videoLessonSearch);
+
+    //老师详情-查询视频课列表
+    List<VideoLessonTeacherVo> selectTeacherPage(IPage page, @Param("param") VideoLessonSearch videoLessonSearch);
+
+    //老师详情-视频课详情-查询购买学员列表
+    List<VideoLessonPurchaseVo> selectPurchaseStudent(IPage page, @Param("param") VideoLessonSearch search);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/EmployeeDto.java

@@ -0,0 +1,95 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yonge.cooleshow.biz.dal.entity.Employee;
+import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
+import com.yonge.cooleshow.biz.dal.enums.UserLockFlag;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-04-06 16:18:03
+ */
+@ApiModel(value = "EmployeeDto对象", description = "员工表数据传输对象")
+public class EmployeeDto extends Employee{
+    private static final long serialVersionUID = 1L;
+
+    @NotBlank(message = "用户姓名不能为空")
+    @ApiModelProperty("昵称")
+    private String username;
+    @NotNull(message = "性别不能为空")
+    @ApiModelProperty(value = "性别 0女 1男")
+    private GenderEnum gender;
+    @NotBlank(message = "手机号不能为空")
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+    @NotNull(message = "入职时间不能为空")
+    @ApiModelProperty("入职时间 ")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date entryDate;
+    @NotNull(message = "角色不能为空")
+    @ApiModelProperty(value = "角色id列表")
+    private List<Long> roleIds;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public GenderEnum getGender() {
+        return gender;
+    }
+
+    public void setGender(GenderEnum gender) {
+        this.gender = gender;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public List<Long> getRoleIds() {
+        return roleIds;
+    }
+
+    public void setRoleIds(List<Long> roleIds) {
+        this.roleIds = roleIds;
+    }
+
+    @Override
+    public Date getEntryDate() {
+        return entryDate;
+    }
+
+    @Override
+    public void setEntryDate(Date entryDate) {
+        this.entryDate = entryDate;
+    }
+
+    public EmployeeDto toEmployeeDto(Employee employee){
+        try {
+            BeanUtils.copyProperties(this,employee);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return this;
+    }
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/LiveCourseGroupDto.java

@@ -23,10 +23,6 @@ public class LiveCourseGroupDto implements Serializable {
     @ApiModelProperty(value = "主键")
     private Long id;
 
-    @NotBlank(message = "课程类型不能为空")
-    @ApiModelProperty(value = "类型 practice陪练课 live直播课")
-    private String type;
-
     @NotNull(message = "授课老师不能为空")
     @ApiModelProperty(value = "授课老师")
     private Long teacherId;
@@ -79,7 +75,7 @@ public class LiveCourseGroupDto implements Serializable {
     private List<CoursePlanDto> CoursePlanList;
 
     @ApiModel(value = "课程详情接收类")
-    static class CoursePlanDto extends CourseTimeEntity implements Serializable {
+    public static class CoursePlanDto extends CourseTimeEntity implements Serializable {
 
         @NotNull(message = "课堂编号不能为空")
         @ApiModelProperty(value = "课堂编号-第几堂课")
@@ -115,14 +111,6 @@ public class LiveCourseGroupDto implements Serializable {
         this.id = id;
     }
 
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
     public Long getTeacherId() {
         return teacherId;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/TeacherMusicSheetAuditReq.java

@@ -0,0 +1,55 @@
+package com.yonge.cooleshow.biz.dal.dto.req;
+
+
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Description 曲目审核参数
+ *
+ * @author liujunchi
+ * @date 2022-04-02
+ */
+@ApiModel(value = "TeacherMusicSheetAuditReq对象", description = "曲目审核")
+public class TeacherMusicSheetAuditReq {
+
+    @ApiModelProperty(value = "曲目id",required = true)
+    @NotNull(message = "曲目id不能为空 ")
+    private Long musicSheetId;
+
+    @ApiModelProperty(value = "审批状态（PASS：通过，UNPASS：不通过）",required = true)
+    @NotNull(message = "审批状态不为空 ")
+    private AuthStatusEnum authStatus;
+
+    @ApiModelProperty(value = "审核理由",required = true)
+    @NotBlank(message = "审核理由不能为空 ")
+    private String remark;
+
+    public Long getMusicSheetId() {
+        return musicSheetId;
+    }
+
+    public void setMusicSheetId(Long musicSheetId) {
+        this.musicSheetId = musicSheetId;
+    }
+
+    public AuthStatusEnum getAuthStatus() {
+        return authStatus;
+    }
+
+    public void setAuthStatus(AuthStatusEnum authStatus) {
+        this.authStatus = authStatus;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/AuthEntryRecordSearch.java

@@ -2,7 +2,7 @@ package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -14,7 +14,7 @@ import java.util.Date;
  * @Data: 2022/3/21 15:26
  */
 @ApiModel(value = "AuthEntryRecordSearch", description = "审核列表查询")
-public class AuthEntryRecordSearch extends Query {
+public class AuthEntryRecordSearch extends QueryInfo{
     @ApiModelProperty(value = "老师编号/名称/电话")
     private String search;
     @ApiModelProperty(value = "审批人")
@@ -27,7 +27,7 @@ public class AuthEntryRecordSearch extends Query {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endTime;
-    @ApiModelProperty(value = "审核状态  0、未申请 1、审核中 2、通过 3、不通过")
+    @ApiModelProperty(value = "审核状态  UNPAALY、未申请 DOING、审核中 PASS、通过 UNPASS、不通过")
     private AuthStatusEnum authStatus;
 
     public String getSearch() {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/CourseHomeworkSearch.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "CourseHomeworkSearch对象", description = "课程作业表查询对象")
-public class CourseHomeworkSearch extends Query{
+public class CourseHomeworkSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/CourseScheduleRepliedSearch.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "CourseScheduleRepliedSearch对象", description = "课程点评查询对象")
-public class CourseScheduleRepliedSearch extends Query{
+public class CourseScheduleRepliedSearch extends QueryInfo {
 	private static final long serialVersionUID = 1L;
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/EmployeeSearch.java

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.biz.dal.dto.search;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -15,7 +15,7 @@ import java.util.Date;
  * @Data: 2022/3/21 15:26
  */
 @ApiModel(value = "StudentSearch", description = "学院管理查询")
-public class EmployeeSearch extends Query {
+public class EmployeeSearch extends QueryInfo{
     @ApiModelProperty(value = "学院编号/昵称/电话")
     private String search;
     @ApiModelProperty(value = "性别 0女 1男")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicAlbumDetailSearch.java

@@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull;
 public class MusicAlbumDetailSearch extends MusicSheetSearch {
 
     @NotNull(message = "专辑编号ID不能为空")
-    @ApiModelProperty("专辑编号ID")
+    @ApiModelProperty(value = "专辑编号ID",required = true)
     private Long id;
 
     /**
@@ -24,6 +24,8 @@ public class MusicAlbumDetailSearch extends MusicSheetSearch {
     @ApiModelProperty(hidden = true,value = "1：新增曲目，2：已有曲目")
     private Integer type;
 
+    @ApiModelProperty(value = "假删除 0 : 未删除 1：已删除",hidden = true)
+    private Boolean delFlag = false;
 
     public Long getId() {
         return id;
@@ -40,4 +42,14 @@ public class MusicAlbumDetailSearch extends MusicSheetSearch {
     public void setType(Integer type) {
         this.type = type;
     }
+
+    @Override
+    public Boolean getDelFlag() {
+        return delFlag;
+    }
+
+    @Override
+    public void setDelFlag(Boolean delFlag) {
+        this.delFlag = delFlag;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicAlbumSearch.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -16,7 +16,7 @@ import java.util.List;
  * @date: 2022-03-31
  */
 @ApiModel(value = "MusicAlbumSearch", description = "专辑列表查询")
-public class MusicAlbumSearch extends Query {
+public class MusicAlbumSearch extends QueryInfo{
 
     @ApiModelProperty("专辑编号/名称")
     private String idAndName;
@@ -28,7 +28,7 @@ public class MusicAlbumSearch extends Query {
     private List<Long> albumTagIdList;
 
     @ApiModelProperty("专辑状态0：停用，1：启用")
-    private StateEnum albumStatus;
+    private YesOrNoEnum albumStatus;
 
     public String getIdAndName() {
         return idAndName;
@@ -57,11 +57,11 @@ public class MusicAlbumSearch extends Query {
         this.albumTagIdList = albumTagIdList;
     }
 
-    public StateEnum getAlbumStatus() {
+    public YesOrNoEnum getAlbumStatus() {
         return albumStatus;
     }
 
-    public void setAlbumStatus(StateEnum albumStatus) {
+    public void setAlbumStatus(YesOrNoEnum albumStatus) {
         this.albumStatus = albumStatus;
     }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicSheetPracticeRecordSearch.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-04-02 10:05:39
  */
 @ApiModel(value = "MusicSheetPracticeRecordSearch对象", description = "曲目练习记录表查询对象")
-public class MusicSheetPracticeRecordSearch extends Query{
+public class MusicSheetPracticeRecordSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicSheetSearch.java

@@ -1,8 +1,8 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -17,7 +17,7 @@ import java.util.List;
  * @date: 2022-03-30
  */
 @ApiModel(value = "MusicSheetSearch对象", description = "曲目表查询对象")
-public class MusicSheetSearch  extends Query {
+public class MusicSheetSearch  extends QueryInfo{
 
     @ApiModelProperty("曲目编号/名称")
     private String idAndName;
@@ -35,14 +35,17 @@ public class MusicSheetSearch  extends Query {
     private List<Long> subjectIdList;
 
     @ApiModelProperty("曲目状态（0：停用，1：启用））")
-    private StateEnum state;
+    private YesOrNoEnum state;
 
-    @ApiModelProperty("曲目审核状态(0:待审核;1:通过;2:未通过)")
-    private AuditEnum auditStatus;
+    @ApiModelProperty("曲目审核状态(DOING:待审核;PASS:通过;UNPASS:未通过)")
+    private AuthStatusEnum auditStatus;
 
     @ApiModelProperty(value = "创建人id （老师id）")
     private Long createBy;
 
+    @ApiModelProperty(value = "假删除 false : 未删除 true：已删除",hidden = true)
+    private Boolean delFlag = false;
+
     public String getIdAndName() {
         return idAndName;
     }
@@ -89,19 +92,19 @@ public class MusicSheetSearch  extends Query {
         }
     }
 
-    public StateEnum getState() {
+    public YesOrNoEnum getState() {
         return state;
     }
 
-    public void setState(StateEnum state) {
+    public void setState(YesOrNoEnum state) {
         this.state = state;
     }
 
-    public AuditEnum getAuditStatus() {
+    public AuthStatusEnum getAuditStatus() {
         return auditStatus;
     }
 
-    public void setAuditStatus(AuditEnum auditStatus) {
+    public void setAuditStatus(AuthStatusEnum auditStatus) {
         this.auditStatus = auditStatus;
     }
 
@@ -112,4 +115,12 @@ public class MusicSheetSearch  extends Query {
     public void setCreateBy(Long createBy) {
         this.createBy = createBy;
     }
+
+    public Boolean getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Boolean delFlag) {
+        this.delFlag = delFlag;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicTagSearch.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -10,14 +10,14 @@ import io.swagger.annotations.ApiModelProperty;
  * @Data: 2022-03-29 17:47:57
  */
 @ApiModel(value = "MusicTagSearch对象", description = "音乐标签表查询对象")
-public class MusicTagSearch extends Query{
+public class MusicTagSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 	@ApiModelProperty("标签编号/名称")
 	private String idAndName;
 
 	@ApiModelProperty("标签状态（0：禁用，1：启用）")
-	private StateEnum state;
+	private YesOrNoEnum state;
 
 	public String getIdAndName() {
 		return idAndName;
@@ -27,11 +27,11 @@ public class MusicTagSearch extends Query{
 		this.idAndName = idAndName;
 	}
 
-	public StateEnum getState() {
+	public YesOrNoEnum getState() {
 		return state;
 	}
 
-	public void setState(StateEnum state) {
+	public void setState(YesOrNoEnum state) {
 		this.state = state;
 	}
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/OrderDetailSearch.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "OrderDetailSearch对象", description = "平台订单表查询对象")
-public class OrderDetailSearch extends Query{
+public class OrderDetailSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/OrderRefundsSearch.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "OrderRefundsSearch对象", description = "用户退款表查询对象")
-public class OrderRefundsSearch extends Query{
+public class OrderRefundsSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/OrderSearch.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "OrderSearch对象", description = "平台订单表查询对象")
-public class OrderSearch extends Query{
+public class OrderSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/StudentAttendanceSearch.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "StudentAttendanceSearch对象", description = "学生考勤表查询对象")
-public class StudentAttendanceSearch extends Query{
+public class StudentAttendanceSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/StudentCourseHomeworkSearch.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "StudentCourseHomeworkSearch对象", description = "学生课程作业查询对象")
-public class StudentCourseHomeworkSearch extends Query{
+public class StudentCourseHomeworkSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/StudentMusicSheetOrderSearch.java

@@ -0,0 +1,129 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.page.QueryInfo;
+import com.yonge.toolset.utils.string.StringUtil;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Description  平台 学生管理 学员详情 乐谱
+ *
+ * @author liujunchi
+ * @date 2022-04-02
+ */
+public class StudentMusicSheetOrderSearch extends QueryInfo {
+
+    @ApiModelProperty(value = "学生id", required = true)
+    @NotNull(message = "学生编号不能为空")
+    private Long studentId;
+
+    @ApiModelProperty("曲目编号/名称")
+    private String idAndName;
+
+    @ApiModelProperty("订单号")
+    private String orderNo;
+
+    @ApiModelProperty("曲目标签id，多个逗号隔开")
+    private String musicTagIds;
+
+    @ApiModelProperty(hidden = true)
+    private List<Long> musicTagList;
+
+    @ApiModelProperty(value = "购买开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date startTime;
+
+    @ApiModelProperty(value = "购买结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date endTime;
+
+    @ApiModelProperty(value = "订单状态 WAIT_PAY 待支付 PAYING 支付中  PAID 已付款 CLOSE 已关闭", hidden = true)
+    private YesOrNoEnum orderStatus = YesOrNoEnum.YES;
+
+    @ApiModelProperty(value = "假删除 0 : 未删除 1：已删除", hidden = true)
+    private Boolean delFlag = false;
+
+    public Long getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Long studentId) {
+        this.studentId = studentId;
+    }
+
+    public String getIdAndName() {
+        return idAndName;
+    }
+
+    public void setIdAndName(String idAndName) {
+        this.idAndName = idAndName;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getMusicTagIds() {
+        return musicTagIds;
+    }
+
+    public void setMusicTagIds(String musicTagIds) {
+        this.musicTagIds = musicTagIds;
+        if (StringUtils.isNotBlank(musicTagIds)) {
+            this.musicTagList = StringUtil.toLongList(musicTagIds);
+        }
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public List<Long> getMusicTagList() {
+        return musicTagList;
+    }
+
+    public void setMusicTagList(List<Long> musicTagList) {
+        this.musicTagList = musicTagList;
+    }
+
+    public Boolean getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Boolean delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public YesOrNoEnum getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(YesOrNoEnum orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/StudentSearch.java

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.biz.dal.dto.search;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -15,7 +15,7 @@ import java.util.Date;
  * @Data: 2022/3/21 15:26
  */
 @ApiModel(value = "StudentSearch", description = "学院管理查询")
-public class StudentSearch extends Query {
+public class StudentSearch extends QueryInfo{
     @ApiModelProperty(value = "学员编号/昵称/电话")
     private String search;
     @ApiModelProperty(value = "性别 0女 1男")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/TeacherMusicSheetAuditSearch.java

@@ -0,0 +1,92 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
+import com.yonge.cooleshow.common.page.QueryInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * Description 老师乐谱审核
+ *
+ * @author liujunchi
+ * @date 2022-04-02
+ */
+@ApiModel(value = "TeacherMusicSheetAuditSearch", description = "老师乐谱审核查询")
+public class TeacherMusicSheetAuditSearch extends QueryInfo{
+
+    @ApiModelProperty("老师编号/名称/电话")
+    private String idAndName;
+
+
+    @ApiModelProperty("审批人")
+    private String auditName;
+
+    @ApiModelProperty(value = "申请开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date startTime;
+
+    @ApiModelProperty(value = "申请结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date endTime;
+
+
+    @ApiModelProperty(value = "审核状态  UNPAALY、未申请 DOING、审核中 PASS、通过 UNPASS、不通过")
+    private AuthStatusEnum authStatus;
+
+    @ApiModelProperty(value = "假删除 0 : 未删除 1：已删除",hidden = true)
+    private Boolean delFlag = false;
+
+    public String getIdAndName() {
+        return idAndName;
+    }
+
+    public void setIdAndName(String idAndName) {
+        this.idAndName = idAndName;
+    }
+
+    public String getAuditName() {
+        return auditName;
+    }
+
+    public void setAuditName(String auditName) {
+        this.auditName = auditName;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public AuthStatusEnum getAuthStatus() {
+        return authStatus;
+    }
+
+    public void setAuthStatus(AuthStatusEnum authStatus) {
+        this.authStatus = authStatus;
+    }
+
+    public Boolean getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Boolean delFlag) {
+        this.delFlag = delFlag;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/TeacherMusicSheetSearch.java

@@ -0,0 +1,80 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yonge.cooleshow.common.page.QueryInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * Description 老师详情 乐谱
+ *
+ * @author liujunchi
+ * @date 2022-04-02
+ */
+@ApiModel(value = "TeacherMusicSheetSearch", description = "老师详情乐谱查询")
+public class TeacherMusicSheetSearch extends QueryInfo{
+
+    @ApiModelProperty(value = "老师编号",required = true)
+    @NotNull(message = "老师ID不为空")
+    private Long teacherId;
+
+    @ApiModelProperty("乐谱编号/名称/作曲人")
+    private String idAndName;
+
+    @ApiModelProperty(value = "上传开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date startTime;
+
+    @ApiModelProperty(value = "上传结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date endTime;
+
+    @ApiModelProperty(value = "假删除 0 : 未删除 1：已删除",hidden = true)
+    private Boolean delFlag = false;
+
+    public Long getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Long teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public String getIdAndName() {
+        return idAndName;
+    }
+
+    public void setIdAndName(String idAndName) {
+        this.idAndName = idAndName;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public Boolean getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Boolean delFlag) {
+        this.delFlag = delFlag;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/TeacherSearch.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
  * @Data: 2022/3/21 15:26
  */
 @ApiModel(value = "TeacherSearch", description = "老师管理查询")
-public class TeacherSearch extends Query {
+public class TeacherSearch extends QueryInfo{
     @ApiModelProperty(value = "老师编号/昵称/电话")
     private String search;
     @ApiModelProperty(value = "老师类型 TOURIST 游客 ENTRY 认证老师 MUSICIAN 平台音乐人")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/TeacherWithdrawalSearch.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "TeacherWithdrawalSearch对象", description = "老师账户提现表查询对象")
-public class TeacherWithdrawalSearch extends Query{
+public class TeacherWithdrawalSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/UserAccountRecordSearch.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "UserAccountRecordSearch对象", description = "用户账户流水表查询对象")
-public class UserAccountRecordSearch extends Query{
+public class UserAccountRecordSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/UserAccountSearch.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "UserAccountSearch对象", description = "用户账户表查询对象")
-public class UserAccountSearch extends Query{
+public class UserAccountSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/UserBankCardSearch.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "UserBankCardSearch对象", description = "用户绑卡记录表查询对象")
-public class UserBankCardSearch extends Query{
+public class UserBankCardSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/VideoLessonGroupSearch.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -9,15 +10,26 @@ import io.swagger.annotations.ApiModelProperty;
  * @date: 2022/3/30 11:32
  */
 @ApiModel(value = "VideoLessonGroupSearch", description = "视频课组列表查询")
-public class VideoLessonGroupSearch extends Query {
+public class VideoLessonGroupSearch extends QueryInfo{
     @ApiModelProperty(value = "审核状态(0:待审核 1:通过 2:未通过)")
-    private Integer auditStatus;
+    private AuditEnum auditStatus;
 
-    public Integer getAuditStatus() {
+    @ApiModelProperty(value = "视频课组id")
+    private Long groupId;
+
+    public AuditEnum getAuditStatus() {
         return auditStatus;
     }
 
-    public void setAuditStatus(Integer auditStatus) {
+    public void setAuditStatus(AuditEnum auditStatus) {
         this.auditStatus = auditStatus;
     }
+
+    public Long getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(Long groupId) {
+        this.groupId = groupId;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/VideoLessonSearch.java

@@ -1,18 +1,52 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yonge.cooleshow.biz.dal.valid.AddGroup;
+import com.yonge.cooleshow.biz.dal.valid.SelectGroup;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
 
 /**
  * @author: cy
  * @date: 2022/3/30 11:32
  */
 @ApiModel(value = "VideoLessonGroupSearch", description = "视频课组列表查询")
-public class VideoLessonSearch extends Query {
+public class VideoLessonSearch extends QueryInfo {
     @ApiModelProperty(value = "视频组id")
+    @NotNull(groups = {SelectGroup.class}, message = "视频组id不能为空")
     private Long videoLessonGroupId;
 
+    @ApiModelProperty(value = "用户id")
+    @NotNull(groups = {AddGroup.class}, message = "用户id不能为空")
+    private Long userId;
+
+    @ApiModelProperty(value = "课程编号/课程组名称/老师编号/老师姓名/老师手机")
+    private String search;
+
+    @ApiModelProperty(value = "订单号")
+    private String orderNo;
+
+    @ApiModelProperty("课程声部")
+    private String lessonSubject;
+
+    @ApiModelProperty(value = "审核状态(0:待审核 1:通过 2:未通过)")
+    private Integer auditStatus;
+
+    @ApiModelProperty(value = "申请开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date startTime;
+
+    @ApiModelProperty(value = "申请结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date endTime;
+
     public Long getVideoLessonGroupId() {
         return videoLessonGroupId;
     }
@@ -20,4 +54,62 @@ public class VideoLessonSearch extends Query {
     public void setVideoLessonGroupId(Long videoLessonGroupId) {
         this.videoLessonGroupId = videoLessonGroupId;
     }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    @Override
+    public String getSearch() {
+        return search;
+    }
+
+    @Override
+    public void setSearch(String search) {
+        this.search = search;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getLessonSubject() {
+        return lessonSubject;
+    }
+
+    public void setLessonSubject(String lessonSubject) {
+        this.lessonSubject = lessonSubject;
+    }
+
+    public Integer getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(Integer auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/VipCardRecordSearch.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "VipCardRecordSearch对象", description = "购买会员卡记录表查询对象")
-public class VipCardRecordSearch extends Query{
+public class VipCardRecordSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/CourseGroup.java

@@ -75,6 +75,10 @@ public class CourseGroup implements Serializable {
     @ApiModelProperty(value = "最少成课人数")
     private Integer mixStudentNum;
 
+    @TableField("pre_student_num_")
+    @ApiModelProperty(value = "预计上课人数")
+    private Integer preStudentNum;
+
     @TableField("course_start_time_")
     @ApiModelProperty(value = "课程开始时间")
     private Date courseStartTime;
@@ -208,6 +212,14 @@ public class CourseGroup implements Serializable {
         this.mixStudentNum = mixStudentNum;
     }
 
+    public Integer getPreStudentNum() {
+        return preStudentNum;
+    }
+
+    public void setPreStudentNum(Integer preStudentNum) {
+        this.preStudentNum = preStudentNum;
+    }
+
     public Date getCourseStartTime() {
         return courseStartTime;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/CoursePlan.java

@@ -24,7 +24,7 @@ public class CoursePlan implements Serializable {
 
     @TableField("course_group_id_")
     @ApiModelProperty(value = "课程组id")
-    private Integer courseGroupId;
+    private Long courseGroupId;
 
     @TableField("class_num_")
     @ApiModelProperty(value = "课堂编号-第几堂课")
@@ -47,11 +47,11 @@ public class CoursePlan implements Serializable {
         this.id = id;
     }
 
-    public Integer getCourseGroupId() {
+    public Long getCourseGroupId() {
         return courseGroupId;
     }
 
-    public void setCourseGroupId(Integer courseGroupId) {
+    public void setCourseGroupId(Long courseGroupId) {
         this.courseGroupId = courseGroupId;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/CourseSchedule.java

@@ -61,10 +61,6 @@ public class CourseSchedule implements Serializable {
     @ApiModelProperty(value = "开始锁定的时间")
     private Date lockTime;
 
-    @TableField("pre_student_num_")
-    @ApiModelProperty(value = "预计上课人数")
-    private Integer preStudentNum;
-
     @TableField("ex_student_num_")
     @ApiModelProperty(value = "实际上课人数")
     private Integer exStudentNum;
@@ -165,14 +161,6 @@ public class CourseSchedule implements Serializable {
         this.lockTime = lockTime;
     }
 
-    public Integer getPreStudentNum() {
-        return preStudentNum;
-    }
-
-    public void setPreStudentNum(Integer preStudentNum) {
-        this.preStudentNum = preStudentNum;
-    }
-
     public Integer getExStudentNum() {
         return exStudentNum;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Employee.java

@@ -1,63 +1,66 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
-
-import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.biz.dal.enums.JobNatureEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 
 /**
- * 对应数据库表(employee):
+ * 员工表
  */
-public class Employee extends SysUser {
-
+@TableName("employee")
+@ApiModel(value = "Employee对象", description = "员工表")
+public class Employee implements Serializable {
+	private static final long serialVersionUID = 1L;
+	@TableId(value = "user_id_", type = IdType.AUTO)
 	private Long userId;
-
-	@ApiModelProperty(value = "工作性质（兼职、全职）",required = false)
-	private JobNatureEnum jobNature;
-
-	@ApiModelProperty(value = "是否试用期(1-是 0-否)",required = false)
-	private YesOrNoEnum isProbationPeriod;
-
-	@ApiModelProperty(value = "学历",required = false)
+	@ApiModelProperty("工作性质（兼职、全职） ")
+	@TableField(value = "job_nature_")
+	private String jobNature;
+	@ApiModelProperty("是否试用期(1-是 0-否) ")
+	@TableField(value = "is_probation_period_")
+	private String isProbationPeriod;
+	@ApiModelProperty("学历 ")
+	@TableField(value = "education_background_")
 	private String educationBackground;
-
-	@ApiModelProperty(value = "毕业学校",required = false)
+	@ApiModelProperty("毕业学校 ")
+	@TableField(value = "graduate_school_")
 	private String graduateSchool;
-
-	@ApiModelProperty(value = "技术职称",required = false)
+	@ApiModelProperty("技术职称 ")
+	@TableField(value = "technical_titles_")
 	private String technicalTitles;
-
-	@ApiModelProperty(value = "入职时间",required = false)
-	private java.util.Date entryDate;
-
-	@ApiModelProperty(value = "更新时间",required = false)
+	@ApiModelProperty("入职时间 ")
+	@TableField(value = "entry_date_")
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-	private java.util.Date updateTime;
-
-	@ApiModelProperty(value = "创建时间",required = false)
+	private Date entryDate;
+	@TableField(value = "create_time_")
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-	private java.util.Date createTime;
-
-	@ApiModelProperty(value = "介绍",required = false)
+	private Date createTime;
+	@TableField(value = "update_time_")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	private Date updateTime;
+	@ApiModelProperty("介绍 ")
+	@TableField(value = "introduction_")
 	private String introduction;
-
-	@ApiModelProperty(value = "离职日期",required = false)
-	private java.util.Date demissionDate;
-
-	@ApiModelProperty(value = "联系地址",required = false)
+	@ApiModelProperty("离职日期 ")
+	@TableField(value = "demission_date_")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	private Date demissionDate;
+	@ApiModelProperty("联系地址 ")
+	@TableField(value = "contact_address_")
 	private String contactAddress;
 
-	@ApiModelProperty(value = "角色id列表",required = false)
-	private List<Integer> roleIds;
-
 	public Long getUserId() {
 		return userId;
 	}
@@ -66,19 +69,19 @@ public class Employee extends SysUser {
 		this.userId = userId;
 	}
 
-	public JobNatureEnum getJobNature() {
+	public String getJobNature() {
 		return jobNature;
 	}
 
-	public void setJobNature(JobNatureEnum jobNature) {
+	public void setJobNature(String jobNature) {
 		this.jobNature = jobNature;
 	}
 
-	public YesOrNoEnum getIsProbationPeriod() {
+	public String getIsProbationPeriod() {
 		return isProbationPeriod;
 	}
 
-	public void setIsProbationPeriod(YesOrNoEnum isProbationPeriod) {
+	public void setIsProbationPeriod(String isProbationPeriod) {
 		this.isProbationPeriod = isProbationPeriod;
 	}
 
@@ -114,26 +117,22 @@ public class Employee extends SysUser {
 		this.entryDate = entryDate;
 	}
 
-	@Override
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	@Override
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	@Override
 	public Date getCreateTime() {
 		return createTime;
 	}
 
-	@Override
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
 
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+
 	public String getIntroduction() {
 		return introduction;
 	}
@@ -157,12 +156,4 @@ public class Employee extends SysUser {
 	public void setContactAddress(String contactAddress) {
 		this.contactAddress = contactAddress;
 	}
-
-	public List<Integer> getRoleIds() {
-		return roleIds;
-	}
-
-	public void setRoleIds(List<Integer> roleIds) {
-		this.roleIds = roleIds;
-	}
-}
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicAlbum.java

@@ -1,11 +1,10 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
-import com.yonge.cooleshow.common.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -47,7 +46,7 @@ public class MusicAlbum extends BaseEntity {
 
     @TableField("album_status_")
     @ApiModelProperty(value = "专辑状态(1:启用;0:停用)")
-    private StateEnum albumStatus;  //专辑状态(1:启用;0:停用)
+    private YesOrNoEnum albumStatus;  //专辑状态(1:启用;0:停用)
 
     @TableField("sort_number_")
     @ApiModelProperty(value = "排序号")
@@ -123,12 +122,12 @@ public class MusicAlbum extends BaseEntity {
 	    return this.albumCoverUrl;
 	}
 
-	public MusicAlbum setAlbumStatus(StateEnum albumStatus) {
+	public MusicAlbum setAlbumStatus(YesOrNoEnum albumStatus) {
 	    this.albumStatus = albumStatus;
 	    return this;
 	}
 
-	public StateEnum getAlbumStatus() {
+	public YesOrNoEnum getAlbumStatus() {
 	    return this.albumStatus;
 	}
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheet.java

@@ -47,10 +47,10 @@ public class MusicSheet implements Serializable {
     @ApiModelProperty(value = "曲谱声部(适用的乐器,可能是多个,用逗号分隔)")
     private String musicSubject;  //曲谱声部(适用的乐器,可能是多个,用逗号分隔)
 
-    @NotBlank(message = "曲谱音频文件类型不能为空!")
+    @NotNull(message = "曲谱音频文件类型不能为空!")
     @TableField("audio_type_")
-    @ApiModelProperty(value = "曲目音频类型 1：mp3, 2:midi, 3:mp3_metronome")
-    private AudioTypeEnum audioType;  //曲谱音频文件类型(midi;mp3)
+    @ApiModelProperty(value = "曲目音频类型 MP3：mp3, MIDI:midi, MP3_METRONOME:mp3_metronome")
+    private AudioTypeEnum audioType;
 
     @NotBlank(message = "曲谱标签不能为空!")
     @TableField("music_tag_")
@@ -71,17 +71,17 @@ public class MusicSheet implements Serializable {
 
     @NotNull(message = "收费类型不能为空!")
     @TableField("charge_type_")
-    @ApiModelProperty(value = "收费类型(0:免费;1:会员;2:单曲收费)")
+    @ApiModelProperty(value = "收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)")
     private ChargeTypeEnum chargeType;  //收费类型(0:免费;1:会员;2:单曲收费)
 
 
 	@TableField("state_")
 	@ApiModelProperty(value = "曲目状态(0:停用，1：启用)")
-	private StateEnum state;
+	private YesOrNoEnum state;
 
     @TableField("audit_status_")
-    @ApiModelProperty(value = "审核状态(0:待审核;1:通过;2:未通过)")
-    private AuditEnum auditStatus;  //审核状态(0:待审核;1:通过;2:未通过)
+    @ApiModelProperty(value = "审核状态(DOING:待审核;PASS:通过;UNPASS:未通过)")
+    private AuthStatusEnum auditStatus;
 
     @TableField("sort_number_")
     @ApiModelProperty(value = "排序号")
@@ -133,6 +133,11 @@ public class MusicSheet implements Serializable {
     @ApiModelProperty(value = "备注")
     private String remark;  //备注，填写未通过审核的原因
 
+
+	@TableField("del_flag_")
+	@ApiModelProperty(value = "假删除标识 0：未删除 1：已删除")
+	private Boolean delFlag;
+
 	public Long getId() {
 		return id;
 	}
@@ -221,19 +226,19 @@ public class MusicSheet implements Serializable {
 		this.chargeType = chargeType;
 	}
 
-	public StateEnum getState() {
+	public YesOrNoEnum getState() {
 		return state;
 	}
 
-	public void setState(StateEnum state) {
+	public void setState(YesOrNoEnum state) {
 		this.state = state;
 	}
 
-	public AuditEnum getAuditStatus() {
+	public AuthStatusEnum getAuditStatus() {
 		return auditStatus;
 	}
 
-	public void setAuditStatus(AuditEnum auditStatus) {
+	public void setAuditStatus(AuthStatusEnum auditStatus) {
 		this.auditStatus = auditStatus;
 	}
 
@@ -333,4 +338,11 @@ public class MusicSheet implements Serializable {
 		this.remark = remark;
 	}
 
+	public Boolean getDelFlag() {
+		return delFlag;
+	}
+
+	public void setDelFlag(Boolean delFlag) {
+		this.delFlag = delFlag;
+	}
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheetAuthRecord.java

@@ -0,0 +1,103 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 曲目审核表
+ */
+@TableName("music_sheet_auth_record")
+@ApiModel(value = "MusicSheetAuthRecord对象", description = "曲目审核表")
+public class MusicSheetAuthRecord implements Serializable {
+	private static final long serialVersionUID = 1L;
+    @ApiModelProperty("审核单id ")
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @ApiModelProperty("曲目id ")
+	@TableField(value = "music_sheet_id_")
+    private Long musicSheetId;
+    @ApiModelProperty("审核状态 DOING:审核中;PASS:通过;UNPASS:未通过 ")
+	@TableField(value = "audit_state_")
+    private AuthStatusEnum auditState;
+    @ApiModelProperty("审核人 ")
+	@TableField(value = "verify_user_id_")
+    private Long verifyUserId;
+    @ApiModelProperty("审核理由 ")
+	@TableField(value = "reason_")
+    private String reason;
+	@TableField(value = "create_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime;
+	@TableField(value = "update_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date updateTime;
+
+	public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    
+	public Long getMusicSheetId() {
+        return musicSheetId;
+    }
+
+    public void setMusicSheetId(Long musicSheetId) {
+        this.musicSheetId = musicSheetId;
+    }
+    
+	public AuthStatusEnum getAuditState() {
+        return auditState;
+    }
+
+    public void setAuditState(AuthStatusEnum auditState) {
+        this.auditState = auditState;
+    }
+    
+	public Long getVerifyUserId() {
+        return verifyUserId;
+    }
+
+    public void setVerifyUserId(Long verifyUserId) {
+        this.verifyUserId = verifyUserId;
+    }
+    
+	public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+    
+	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;
+    }
+    
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheetPurchaseRecord.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.common.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -48,7 +49,7 @@ public class MusicSheetPurchaseRecord extends BaseEntity {
 
     @TableField("order_status_")
     @ApiModelProperty(value = "订单状态(1:已完成;0:取消)")
-    private Integer orderStatus;  //订单状态(1:已完成;0:取消)
+    private YesOrNoEnum orderStatus;  //订单状态(1:已完成;0:取消)
 
 
 	public MusicSheetPurchaseRecord setId(Long id) {
@@ -114,12 +115,12 @@ public class MusicSheetPurchaseRecord extends BaseEntity {
 	    return this.purchasePrice;
 	}
 
-	public MusicSheetPurchaseRecord setOrderStatus(Integer orderStatus) {
+	public MusicSheetPurchaseRecord setOrderStatus(YesOrNoEnum orderStatus) {
 	    this.orderStatus = orderStatus;
 	    return this;
 	}
 
-	public Integer getOrderStatus() {
+	public YesOrNoEnum getOrderStatus() {
 	    return this.orderStatus;
 	}
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicTag.java

@@ -4,15 +4,14 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 音乐标签表
@@ -34,11 +33,11 @@ public class MusicTag implements Serializable {
 
     @TableField(value = "state_")
     @ApiModelProperty(value = "标签状态（0：禁用，1：启用）")
-    private StateEnum state;
+    private YesOrNoEnum state;
 
 	@TableField(value = "del_flag_")
     @ApiModelProperty(value = "假删标识（0：正常，1：删除）")
-    private Boolean delFlag;
+    private Boolean delFlag= false;
 
 	@TableField(value = "create_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -108,11 +107,11 @@ public class MusicTag implements Serializable {
         this.updateTime = updateTime;
     }
 
-    public StateEnum getState() {
+    public YesOrNoEnum getState() {
         return state;
     }
 
-    public void setState(StateEnum state) {
+    public void setState(YesOrNoEnum state) {
         this.state = state;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/RoomInfoCache.java

@@ -17,6 +17,9 @@ public class RoomInfoCache implements Serializable {
     @ApiModelProperty(value = "主讲人名称")
     private String speakerName;
 
+    @ApiModelProperty(value = "主讲人头像")
+    private String speakerPic;
+
     @ApiModelProperty(value = "主讲人 0在房间 1不在房间")
     private Integer speakerState;
 
@@ -156,4 +159,12 @@ public class RoomInfoCache implements Serializable {
     public void setLookNum(Integer lookNum) {
         this.lookNum = lookNum;
     }
+
+    public String getSpeakerPic() {
+        return speakerPic;
+    }
+
+    public void setSpeakerPic(String speakerPic) {
+        this.speakerPic = speakerPic;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Subject.java

@@ -43,7 +43,7 @@ public class Subject {
 	
 	/**  */
 	@ApiModelProperty(value = "是否删除1是，0否",required = false)
-	private Boolean delFlag;
+	private Boolean delFlag= false;
 
 	/**  */
 	@ApiModelProperty(value = "子节点列表",required = false)

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Teacher.java

@@ -1,13 +1,11 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.yonge.cooleshow.biz.dal.enums.TeacherTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TeacherAuthEntryRecord.java

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.springframework.format.annotation.DateTimeFormat;
 
 /**
@@ -79,7 +80,7 @@ public class TeacherAuthEntryRecord implements Serializable {
 	@TableField(value = "teacher__certificate_")
     private String teacherCertificate;
 
-    @ApiModelProperty("老师认证审核状态 1、审核中 2、通过 3、不通过 ")
+    @ApiModelProperty("老师认证审核状态 UNPAALY、未申请 DOING、审核中 PASS、通过 UNPASS、不通过")
 	@TableField(value = "teacher_auth_status_")
     private AuthStatusEnum teacherAuthStatus;
     /** 
@@ -95,6 +96,7 @@ public class TeacherAuthEntryRecord implements Serializable {
     @ApiModelProperty("审核理由 ")
 	@TableField(value = "reason_")
     private String reason;
+
 	@TableField(value = "create_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@@ -219,22 +221,6 @@ public class TeacherAuthEntryRecord implements Serializable {
 
     @Override
     public String toString() {
-        return "TeacherAuthEntryRecord{" +
-				"id=" + id +
-						",userId='" + userId + "'" + 
-						",subjectId='" + subjectId + "'" + 
-						",introduction='" + introduction + "'" + 
-						",graduateSchool='" + graduateSchool + "'" + 
-						",subject='" + subject + "'" + 
-						",gradCertificate='" + gradCertificate + "'" + 
-						",degreeCertificate='" + degreeCertificate + "'" + 
-						",teacherCertificate='" + teacherCertificate + "'" + 
-						",teacherAuthStatus='" + teacherAuthStatus + "'" + 
-						",verifyUserId='" + verifyUserId + "'" + 
-						",reason='" + reason + "'" + 
-						",createTime='" + createTime + "'" + 
-						",updateTime='" + updateTime + "'" + 
-		                '}';
-    }
-	
+        return ToStringBuilder.reflectionToString(this);
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TeacherAuthMusicianRecord.java

@@ -33,7 +33,7 @@ public class TeacherAuthMusicianRecord implements Serializable {
 	@TableField(value = "user_id_")
     private Long userId;
 
-    @ApiModelProperty("老师认证审核状态 1、审核中 2、通过 3、不通过 ")
+    @ApiModelProperty("老师认证审核状态 UNPAALY、未申请 DOING、审核中 PASS、通过 UNPASS、不通过")
 	@TableField(value = "teacher_auth_status_")
     private AuthStatusEnum teacherAuthStatus;
     /** 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/UserOrderPayment.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yonge.cooleshow.biz.dal.enums.PayChannelEnum;
+import com.yonge.cooleshow.biz.dal.enums.PayStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -30,18 +32,16 @@ public class UserOrderPayment implements Serializable {
     private String transNo;
     @ApiModelProperty("支付渠道:  alipay 支付宝  wx_lite 微信 ")
 	@TableField(value = "pay_channel_")
-    private String payChannel;
+    private PayChannelEnum payChannel;
     @ApiModelProperty("交易金额，必须大于0，保留两位小数点，如0.10、100.05等 ")
 	@TableField(value = "pay_amt_")
     private BigDecimal payAmt;
     @ApiModelProperty("支付详情信息（用于拉起支付） ")
-	@TableField(value = "pay_info")
+	@TableField(value = "pay_info_")
     private String payInfo;
-    @ApiModelProperty("失效时间（超过支付失效时间的订单，会取出来判断是否已经关单，最大失效时间往前推5分钟） ")
-	@TableField(value = "invalid_time_")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date invalidTime;
+    @ApiModelProperty("交易状态 pending 交易处理中 succeeded 交易成功 failed 交易失败")
+    @TableField(value = "status_")
+    private PayStatusEnum status;
     @ApiModelProperty("到账时间 ")
 	@TableField(value = "arrival_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -85,16 +85,16 @@ public class UserOrderPayment implements Serializable {
     public void setTransNo(String transNo) {
         this.transNo = transNo;
     }
-    
-	public String getPayChannel() {
+
+    public PayChannelEnum getPayChannel() {
         return payChannel;
     }
 
-    public void setPayChannel(String payChannel) {
+    public void setPayChannel(PayChannelEnum payChannel) {
         this.payChannel = payChannel;
     }
-    
-	public BigDecimal getPayAmt() {
+
+    public BigDecimal getPayAmt() {
         return payAmt;
     }
 
@@ -109,16 +109,16 @@ public class UserOrderPayment implements Serializable {
     public void setPayInfo(String payInfo) {
         this.payInfo = payInfo;
     }
-    
-	public Date getInvalidTime() {
-        return invalidTime;
+
+    public PayStatusEnum getStatus() {
+        return status;
     }
 
-    public void setInvalidTime(Date invalidTime) {
-        this.invalidTime = invalidTime;
+    public void setStatus(PayStatusEnum status) {
+        this.status = status;
     }
-    
-	public Date getArrivalTime() {
+
+    public Date getArrivalTime() {
         return arrivalTime;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/AudioTypeEnum.java

@@ -9,23 +9,24 @@ import com.yonge.cooleshow.common.enums.BaseEnum;
  * @author liujunchi
  * @date 2022-04-01
  */
-public enum AudioTypeEnum implements BaseEnum<Integer,AudioTypeEnum> {
+public enum AudioTypeEnum implements BaseEnum<String,AudioTypeEnum> {
 
 
-    MP3(1,"mp3"),
-    MIDI(2,"midi"),
-    MP3_METRONOME(3,"mp3_metronome");
+    MP3("MP3","mp3"),
+    MIDI("MIDI","midi"),
+    MP3_METRONOME("MP3_METRONOME","mp3_metronome");
     @EnumValue
-    private Integer code;
+    private String code;
     private String msg;
 
-    AudioTypeEnum(Integer code, String msg) {
+    AudioTypeEnum(String code,String msg) {
         this.code = code;
         this.msg = msg;
     }
 
-    public void setCode(Integer code) {
-        this.code = code;
+    @Override
+    public String getCode() {
+        return this.code;
     }
 
     public String getMsg() {
@@ -35,9 +36,4 @@ public enum AudioTypeEnum implements BaseEnum<Integer,AudioTypeEnum> {
     public void setMsg(String msg) {
         this.msg = msg;
     }
-
-    @Override
-    public Integer getCode() {
-        return this.code;
-    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/AuthStatusEnum.java

@@ -9,28 +9,34 @@ import com.yonge.cooleshow.common.enums.BaseEnum;
  * @Author: liweifan
  * @Data: 2022/3/16 10:19
  */
-public enum AuthStatusEnum implements BaseEnum<Integer, AuthStatusEnum> {
-    UNPAALY(0,"未申请"),
-    DOING(1, "审核中"),
-    PASS(2, "通过"),
-    UNPASS(3, "不通过");
+public enum AuthStatusEnum implements BaseEnum<String, AuthStatusEnum> {
+    UNPAALY("未申请"),
+    DOING("审核中"),
+    PASS("通过"),
+    UNPASS("不通过");
     @EnumValue
-    private Integer code;
-
+    private String code;
     private String msg;
 
-    AuthStatusEnum(Integer code, String msg) {
-        this.code = code;
+    AuthStatusEnum(String msg) {
+        this.code = getCode();
         this.msg = msg;
     }
 
+    @Override
+    public String getCode() {
+        return this.name();
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
     public String getMsg() {
         return msg;
     }
 
-    @Override
-    public Integer getCode() {
-        return this.code;
+    public void setMsg(String msg) {
+        this.msg = msg;
     }
-
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/ChargeTypeEnum.java

@@ -4,26 +4,26 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.yonge.cooleshow.common.enums.BaseEnum;
 
 /**
- * Description 收费类型(0:免费;1:会员;2:单曲收费)
+ * Description 收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)
  *
  * @author: liujunchi
  * @date: 2022-03-30
  */
-public enum ChargeTypeEnum implements BaseEnum<Integer,ChargeTypeEnum> {
+public enum ChargeTypeEnum implements BaseEnum<String,ChargeTypeEnum> {
 
-    FREE(0,"免费"),
-    VIP(1,"会员"),
-    CHARGE(2,"单曲收费");
+    FREE("FREE","免费"),
+    VIP("VIP","会员"),
+    CHARGE("CHARGE","单曲收费");
     @EnumValue
-    private Integer code;
+    private String code;
     private String msg;
 
-    ChargeTypeEnum(Integer code, String msg) {
+    ChargeTypeEnum(String code, String msg) {
         this.code = code;
         this.msg = msg;
     }
 
-    public void setCode(Integer code) {
+    public void setCode(String code) {
         this.code = code;
     }
 
@@ -36,7 +36,7 @@ public enum ChargeTypeEnum implements BaseEnum<Integer,ChargeTypeEnum> {
     }
 
     @Override
-    public Integer getCode() {
+    public String getCode() {
         return this.code;
     }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/OpenEnum.java

@@ -1,33 +0,0 @@
-package com.yonge.cooleshow.biz.dal.enums;
-
-import com.baomidou.mybatisplus.annotation.EnumValue;
-import com.yonge.cooleshow.common.enums.BaseEnum;
-
-/**
- * Description 标签列表是否展开列表
- *
- * @author: liujunchi
- * @date: 2022-03-30
- */
-public enum OpenEnum implements BaseEnum<Integer, OpenEnum> {
-    OPEN(0,"展开"),
-    CLOSE(1, "不展开");
-    @EnumValue
-    private Integer code;
-
-    private String msg;
-
-    OpenEnum(Integer code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    @Override
-    public Integer getCode() {
-        return this.code;
-    }
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/PayStatusEnum.java

@@ -0,0 +1,41 @@
+package com.yonge.cooleshow.biz.dal.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.cooleshow.common.enums.BaseEnum;
+
+/**
+ * 交易状态 pending 交易处理中 succeeded 交易成功 failed 交易失败
+ * @Author: liweifan
+ * @Data: 2022/3/31 14:59
+ */
+public enum PayStatusEnum implements BaseEnum<String, PayStatusEnum> {
+    pending("pending","交易处理中"),
+    succeeded("succeeded","交易成功"),
+    failed("failed","交易失败")
+    ;
+    @EnumValue
+    private String code;
+    private String msg;
+
+    PayStatusEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    @Override
+    public String getCode() {
+        return this.code;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/StateEnum.java

@@ -1,33 +0,0 @@
-package com.yonge.cooleshow.biz.dal.enums;
-
-import com.baomidou.mybatisplus.annotation.EnumValue;
-import com.yonge.cooleshow.common.enums.BaseEnum;
-
-/**
- * Description
- *
- * @author: liujunchi
- * @date: 2022-03-30
- */
-public enum StateEnum implements BaseEnum<Integer, StateEnum> {
-    STOP(0,"停用"),
-    ENABLE(1, "启用");
-    @EnumValue
-    private Integer code;
-
-    private String msg;
-
-    StateEnum(Integer code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    @Override
-    public Integer getCode() {
-        return this.code;
-    }
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/CourseGroupService.java

@@ -3,10 +3,15 @@ package com.yonge.cooleshow.biz.dal.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.dao.CourseGroupDao;
 import com.yonge.cooleshow.biz.dal.dto.CheckLiveCourseTimeDto;
+import com.yonge.cooleshow.biz.dal.dto.LiveCourseGroupDto;
 import com.yonge.cooleshow.biz.dal.entity.CourseGroup;
 import com.yonge.cooleshow.biz.dal.entity.CourseTimeEntity;
+import com.yonge.cooleshow.biz.dal.vo.CourseGroupVo;
+import com.yonge.cooleshow.biz.dal.vo.LiveCourseInfoVo;
+import com.yonge.cooleshow.common.page.PageInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 课程组表(CourseGroup)表服务接口
@@ -19,9 +24,34 @@ public interface CourseGroupService extends IService<CourseGroup> {
     CourseGroupDao getDao();
 
     /**
+     * 查询课程组详情-直播课详情
+     *
+     * @param groupId 课程组id
+     */
+    LiveCourseInfoVo queryLiveCourseInfo(Long groupId);
+
+    /**
+     * 分页查询课程组列表
+     *
+     * @param param 传入参数
+     *              <p> - teacherId    老师id
+     *              <p> - groupStatus  课程组状态  ING(进行中)  NOT_SALE(未开售,未上架) APPLY(报名中,销售中) COMPLETE(已完成)
+     *              <p> - row 条数
+     *              <p> - page 页数
+     */
+    PageInfo<CourseGroupVo> queryPageLiveCourseGroup(Map<String, Object> param);
+
+    void addLiveCourse(LiveCourseGroupDto dto);
+
+    /**
      * 创建直播课程组时将课时写到缓存当作锁定的时间
      */
     List<CourseTimeEntity> lockCourseToCache(CheckLiveCourseTimeDto dto);
 
+    /**
+     * 创建直播课程组-解除锁定课程时间-删除写到缓存当作锁定的课时
+     */
+    void unlockCourseToCache(Long teacherId);
+
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/CoursePlanService.java

@@ -3,6 +3,9 @@ package com.yonge.cooleshow.biz.dal.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.dao.CoursePlanDao;
 import com.yonge.cooleshow.biz.dal.entity.CoursePlan;
+import com.yonge.cooleshow.biz.dal.vo.LiveCourseInfoVo;
+
+import java.util.List;
 
 /**
  * 课程计划表(CoursePlan)表服务接口
@@ -13,5 +16,12 @@ import com.yonge.cooleshow.biz.dal.entity.CoursePlan;
 public interface CoursePlanService extends IService<CoursePlan> {
 
     CoursePlanDao getDao();
+
+    /**
+     * 根据课程组id查询课程计划信息
+     *
+     * @param groupId 课程组id
+     */
+    List<LiveCourseInfoVo.PlanVo> queryCoursePlanByGroupId(Long groupId);
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/CourseScheduleService.java

@@ -3,7 +3,8 @@ package com.yonge.cooleshow.biz.dal.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.dao.CourseScheduleDao;
 import com.yonge.cooleshow.biz.dal.entity.CourseSchedule;
-import com.yonge.cooleshow.biz.dal.vo.TeacherCourseVo;
+import com.yonge.cooleshow.biz.dal.vo.CourseGroupVo;
+import com.yonge.cooleshow.biz.dal.vo.TeacherLiveCourseInfoVo;
 import com.yonge.cooleshow.common.page.PageInfo;
 
 import javax.validation.Valid;
@@ -32,7 +33,7 @@ public interface CourseScheduleService extends IService<CourseSchedule> {
      *              <p> - page 页数
      *              <p> - status 课程状态 NOT_START未开始 ING进行中 COMPLETE已完成
      */
-    PageInfo<TeacherCourseVo> queryTeacherLiveCourse(Map<String, Object> param);
+    PageInfo<TeacherLiveCourseInfoVo> queryTeacherLiveCourse(Map<String, Object> param);
 
     /**
      * 校验该学生大于当前时间并未开始的课程时间和传入时间段有没有交集
@@ -82,14 +83,14 @@ public interface CourseScheduleService extends IService<CourseSchedule> {
                                 Date startTime, Date endTime);
 
     /**
-     * 锁定课时
+     * 修改-锁定课时
      *
      * @param id 课程id
      */
     void lockCourseTime(Long id);
 
     /**
-     * 解锁
+     * 修改-解锁课时
      *
      * @param id 课程id
      */

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/CourseScheduleStudentPaymentService.java

@@ -5,8 +5,11 @@ import com.yonge.cooleshow.biz.dal.dao.CourseScheduleStudentPaymentDao;
 import com.yonge.cooleshow.biz.dal.dto.ImNetworkCustomMessage;
 import com.yonge.cooleshow.biz.dal.dto.ImNetworkRoomMusicSheetDownloadData;
 import com.yonge.cooleshow.biz.dal.entity.CourseScheduleStudentPayment;
+import com.yonge.cooleshow.biz.dal.vo.LiveCourseInfoVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 课程学生缴费表(CourseScheduleStudentPayment)表服务接口
  *
@@ -18,6 +21,13 @@ public interface CourseScheduleStudentPaymentService extends IService<CourseSche
     CourseScheduleStudentPaymentDao getDao();
 
     /**
+     * 根据课程组id查询学员信息
+     *
+     * @param groupId 课程组id
+     */
+    List<LiveCourseInfoVo.CourseBuyStudentVo> queryStudentInfoByGroupId(@Param("groupId") Long groupId);
+
+    /**
     * @description: 获取网络教室成员midi
      * @param courseScheduleId
      * @param userId

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/EmployeeService.java

@@ -2,11 +2,17 @@ package com.yonge.cooleshow.biz.dal.service;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.auth.api.entity.SysRole;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.EmployeeDto;
 import com.yonge.cooleshow.biz.dal.dto.search.EmployeeSearch;
+import com.yonge.cooleshow.biz.dal.dto.search.StudentSearch;
 import com.yonge.cooleshow.biz.dal.entity.Employee;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.biz.dal.vo.EmployeeVo;
+import com.yonge.cooleshow.biz.dal.vo.StudentVo;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.cooleshow.common.service.BaseService;
 
@@ -18,27 +24,27 @@ public interface EmployeeService extends BaseService<Long, Employee> {
      * @updateTime 2022/3/25 11:52
      * @return: com.yonge.cooleshow.biz.dal.entity.Employee
      */
-    Employee detail(Long userId);
+    EmployeeVo detail(Long id);
     /***
-     * 分页擦查询
+     * 分页查询
      * @author liweifan
      * @param: page
      * @param: employeeSearch
-     * @updateTime 2022/3/25 13:44
+     * @updateTime 2022/4/6 13:56
      * @return: com.baomidou.mybatisplus.core.metadata.IPage<com.yonge.cooleshow.biz.dal.entity.Employee>
      */
-    PageInfo<Employee> selectPage(Query page, EmployeeSearch employeeSearch);
+    IPage<EmployeeVo> selectPage(IPage<EmployeeVo> page, EmployeeSearch employeeSearch);
     /**
      * 新增员工
      * @param employee
      */
-    void add(Employee employee) throws Exception;
+    HttpResponseResult<EmployeeDto> addEmployee(EmployeeDto employee) throws Exception;
 
     /**
      * 修改员工信息
      * @param employee
      */
-    void updateEmployee(Employee employee) throws Exception;
+    HttpResponseResult<EmployeeDto> updateEmployee(EmployeeDto employee) throws Exception;
 
     /***
      * 通过手机号查询用户

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/MusicAlbumService.java

@@ -69,14 +69,14 @@ public interface MusicAlbumService extends IService<MusicAlbum> {
      *
      * @param musicAlbum 专辑对象
      */
-    void createMusicAlbum(MusicAlbum musicAlbum);
+    boolean createMusicAlbum(MusicAlbum musicAlbum);
 
     /**
      * 修改专辑
      *
      * @param musicAlbum 专辑对象
      */
-    void updateMusicAlbum(MusicAlbum musicAlbum);
+    boolean updateMusicAlbum(MusicAlbum musicAlbum);
 
     /**
      * 判断是否已收藏

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/MusicSheetAuthRecordService.java

@@ -0,0 +1,22 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.dto.req.TeacherMusicSheetAuditReq;
+import com.yonge.cooleshow.biz.dal.entity.MusicSheetAuthRecord;
+
+/**
+ * 曲目审核表 服务类
+ * @author liweifan
+ * @date 2022-04-02
+ */
+public interface MusicSheetAuthRecordService extends IService<MusicSheetAuthRecord>  {
+
+    /**
+     * 曲目审核
+     *
+     * @param param 审核信息
+     * @param userId 用户id
+     * @return boolean
+     */
+    boolean audit(TeacherMusicSheetAuditReq param, Long userId);
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/MusicSheetService.java

@@ -4,14 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.auth.api.enums.SysUserType;
 import com.yonge.cooleshow.biz.dal.dto.MusicSheetDto;
-import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumDetailSearch;
-import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
-import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetSearch;
+import com.yonge.cooleshow.biz.dal.dto.req.TeacherMusicSheetAuditReq;
+import com.yonge.cooleshow.biz.dal.dto.search.*;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
-import com.yonge.cooleshow.biz.dal.vo.MusicSheetShareVo;
-import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
+import com.yonge.cooleshow.biz.dal.vo.*;
 
 /**
  * MusicSheetService服务类
@@ -116,4 +113,48 @@ public interface MusicSheetService extends IService<MusicSheet> {
      * @return page
      */
     IPage<MusicSheetVo> practiceMusic(IPage<MusicSheetVo> page, StudentMusicSheetSearch query);
+
+    /**
+     * 学生购买的曲目信息
+     *
+     * @param page 分页信息
+     * @param query 查询条件
+     * @return page
+     */
+    IPage<StudentMusicSheetOrderVo> selectStudentOrderPage(IPage<StudentMusicSheetOrderVo> page, StudentMusicSheetOrderSearch query);
+
+    /**
+     * 老师详情 乐谱 展示
+     *
+     * @param page 分页
+     * @param query 查询条件
+     * @return page
+     */
+    IPage<TeacherMusicSheetVo> selectTeacherPage(IPage<TeacherMusicSheetVo> page, TeacherMusicSheetSearch query);
+
+    /**
+     * 审核中心-乐谱审核
+     *
+     * @param page 分页
+     * @param query 查询条件
+     * @return page
+     */
+    IPage<TeacherMusicSheetVo> selectAuditPage(IPage<TeacherMusicSheetVo> page, TeacherMusicSheetAuditSearch query);
+
+    /**
+     * 审核曲目
+     *
+     * @param param 审核信息
+     * @param userId 审核员id
+     * @return boolean
+     */
+    boolean audit(TeacherMusicSheetAuditReq param, Long userId);
+
+    /**
+     * 假删除曲目
+     *
+     * @param id 曲目id
+     * @return boolean
+     */
+    boolean del(Long id);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/MusicTagService.java

@@ -51,14 +51,14 @@ public interface MusicTagService extends IService<MusicTag>  {
 	 *
 	 * @param musicTagSaveDto 音乐标签信息
 	 */
-    void createMusicTag(MusicTagSaveDto musicTagSaveDto);
+    boolean createMusicTag(MusicTagSaveDto musicTagSaveDto);
 
 	/**
 	 * 修改音乐标签
 	 *
 	 * @param musicTagSaveDto 音乐标签信息
 	 */
-	void updateMusicTag(MusicTagSaveDto musicTagSaveDto);
+	boolean updateMusicTag(MusicTagSaveDto musicTagSaveDto);
 
 	/**
 	 * 获取标签树

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/SubjectService.java

@@ -9,24 +9,42 @@ import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.cooleshow.common.service.BaseService;
 
 public interface SubjectService extends BaseService<Long, Subject> {
-
-	/**
-	 * 分页查询科目树状列表
-	 *
-	 * @param queryInfo
-	 * @return
+	/***
+	 * 通过id集合查询声部
+	 * @param: subjectIdList
+	 * @updateTime 2022/4/6 11:27
+	 * @return: java.util.List<com.yonge.cooleshow.biz.dal.entity.Subject>
+	 */
+	List<Subject> findBySubjectByIdList(List<Long> subjectIdList);
+	/***
+	 * 通过声部id（字符串拼接）查询声部
+	 * @author liweifan
+	 * @param: subjectIdList
+	 * @updateTime 2022/4/6 11:31
+	 * @return: java.util.List<com.yonge.cooleshow.biz.dal.entity.Subject>
+	 */
+	List<Subject> findBySubjectByIdList(String subjectIdList);
+	/***
+	 * 分页查询声部树状列表
+	 * @param: queryInfo
+	 * @updateTime 2022/4/6 11:28
+	 * @return: com.yonge.cooleshow.common.page.PageInfo<com.yonge.cooleshow.biz.dal.entity.Subject>
 	 */
 	PageInfo<Subject> queryPageTree(SubjectQueryInfo queryInfo);
-    
-    int deleteById(Long id);
-
-	/**
-	 * 修改、新增科目树状列表
-	 *
-	 * @param subject
+	/***
+	 * 修改、新增声部树状列表
+	 * @param: subject
+	 * @updateTime 2022/4/6 11:28
 	 */
 	void upSetSubject(Subject subject);
-
+	/***
+	 * 通过id删除声部
+	 * @author liweifan
+	 * @param: id
+	 * @updateTime 2022/4/6 11:29
+	 * @return: int
+	 */
+    int deleteById(Long id);
 	/***
 	 * 查询科目选择框
 	 * @author liweifan
@@ -34,10 +52,4 @@ public interface SubjectService extends BaseService<Long, Subject> {
 	 * @return: java.util.List<com.yonge.cooleshow.biz.dal.vo.SubjectSelectVo>
 	 */
 	List<SubjectSelectVo> subjectSelect();
-
-	List<Subject> findBySubjectByIdList(List<Long> subjectIdList);
-
-	List<Subject> findBySubjectByIdList(String subjectIdList);
-
-
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/SysConfigService.java

@@ -10,7 +10,7 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
 	public static final String SMS_MAX_TIMES = "sms_max_times";
 
     /**
-     * @return com.ym.mec.biz.dal.entity.SysConfig
+     * @return com.yonge.cooleshow.biz.dal.entity.SysConfig
      * @params paramName
      * @describe 根据配置名称获取配置信息
      */

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/SysUserContractsService.java

@@ -13,7 +13,7 @@ public interface SysUserContractsService extends BaseService<Long, SysUserContra
      * @date 2020.09.18
      * @param userId:
      * @param contractType:
-     * @return java.util.List<com.ym.mec.biz.dal.entity.SysUserContracts>
+     * @return java.util.List<com.yonge.cooleshow.biz.dal.entity.SysUserContracts>
      */
     List<SysUserContracts> getUserContractWithType(Long userId, SysUserContracts.ContractType contractType, Integer contractVersion);