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

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)
+	@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-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/EmployeeController.java

@@ -4,9 +4,11 @@ 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.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;
@@ -18,6 +20,7 @@ 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.*;
@@ -26,6 +29,8 @@ 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
@@ -42,8 +47,8 @@ public class EmployeeController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "id", paramType = "path", dataType = "long", required = true),
     })
-    public HttpResponseResult<Employee> detail(@PathVariable("id") Long id){
-        Employee detail = employeeService.detail(id);
+    public HttpResponseResult<EmployeeVo> detail(@PathVariable("id") Long id){
+        EmployeeVo detail = employeeService.detail(id);
         return succeed(detail);
     }
 
@@ -53,41 +58,38 @@ public class EmployeeController extends BaseController {
     @ApiOperation(value = "查询分页", notes = "传入student")
     @PostMapping("/page")
     @PreAuthorize("@pcs.hasPermissions('employee/page')")
-    public HttpResponseResult<PageInfo<Employee>> page(@RequestBody EmployeeSearch query) {
+    public HttpResponseResult<PageInfo<EmployeeVo>> page(@RequestBody EmployeeSearch query) {
         query.setSort("id_");
-        IPage<Employee> pages = employeeService.selectPage(PageUtil.getPage(query), query);
+        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("/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;
 
 /**
@@ -51,7 +48,7 @@ public class MusicAlbumController extends BaseController {
 
         musicAlbum.setCreateBy(sysUser.getId());
         musicAlbum.setCreateTime(new Date());
-        musicAlbum.setAlbumStatus(StateEnum.STOP);
+        musicAlbum.setAlbumStatus(YesOrNoEnum.NO);
         return succeed(musicAlbumService.createMusicAlbum(musicAlbum));
     }
 
@@ -127,7 +124,7 @@ public class MusicAlbumController extends BaseController {
     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);
     }

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

@@ -12,10 +12,7 @@ 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.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
@@ -85,7 +82,7 @@ public class MusicSheetController extends BaseController {
         }
 
         musicSheetDto.setUserId(0L);
-        musicSheetDto.setAuditStatus(AuditEnum.OPEN);
+        musicSheetDto.setAuditStatus(AuthStatusEnum.PASS);
         musicSheetDto.setDelFlag(false);
         List<MusicSheetAccompaniment> list;
         if (!AudioTypeEnum.MIDI.getCode().equals(musicSheetDto.getAudioType().getCode())){
@@ -99,7 +96,7 @@ public class MusicSheetController extends BaseController {
             BeanUtils.copyProperties(musicSheetDto, musicSheet);
             musicSheet.setCreateBy(sysUser.getId());
             musicSheet.setCreateTime(new Date());
-            musicSheet.setState(StateEnum.STOP);
+            musicSheet.setState(YesOrNoEnum.NO);
             musicSheetService.save(musicSheet);
         }
 

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

@@ -1,9 +1,16 @@
 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;
@@ -14,25 +21,60 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
-* @Author: cy
-* @Date: 2022/4/2
-*/
+ * @Author: cy
+ * @Date: 2022/4/2
+ */
 @RestController
 @RequestMapping("/videoLesson")
 @Api(tags = "视频课")
 @Validated
 public class VideoLessonController extends BaseController {
-	@Autowired
-	private VideoLessonGroupService lessonGroupService;
+    @Autowired
+    private VideoLessonGroupService lessonGroupService;
+    @Autowired
+    private VideoLessonGroupDetailService videoLessonGroupDetailService;
 
     /**
-    * @Description: 查询学员购买视频课
-    * @Author: cy
-    * @Date: 2022/4/2
-    */
-    @ApiOperation(value = "查询学员购买视频课")
-    @PostMapping(value = "/student/page")
-    public HttpResponseResult<PageInfo<VideoLessonStudentDetailVo>> selectStudentPage(@RequestBody VideoLessonSearch query) {
-        return succeed(PageUtil.pageInfo(lessonGroupService.selectStudentPage(PageUtil.getPage(query), query)));
+     * @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-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/EmployeeDao.java

@@ -6,6 +6,7 @@ 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;
 
@@ -22,7 +23,7 @@ public interface EmployeeDao extends BaseDAO<Long, Employee> {
      * @updateTime 2022/3/25 13:36
      * @return: com.yonge.cooleshow.biz.dal.entity.Employee
      */
-    Employee detail(@Param("id") Long id);
+    EmployeeVo detail(@Param("id") Long id);
     /***
      * 平台用户管理分页查询
      * @author liweifan
@@ -31,7 +32,7 @@ public interface EmployeeDao extends BaseDAO<Long, Employee> {
      * @updateTime 2022/4/6 13:58
      * @return: java.util.List<com.yonge.cooleshow.biz.dal.entity.Employee>
      */
-    List<Employee> selectPage(@Param("page") IPage page, @Param("param") EmployeeSearch employeeSearch);
+    List<EmployeeVo> selectPage(@Param("page") IPage page, @Param("param") EmployeeSearch employeeSearch);
 
     /***
      * 插入用户表
@@ -64,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/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/VideoLessonGroupDao.java

@@ -5,9 +5,7 @@ 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.VideoLessonStudentDetailVo;
+import com.yonge.cooleshow.biz.dal.vo.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -20,11 +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<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/req/TeacherMusicSheetAuditReq.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.req;
 
 
-import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -21,9 +21,9 @@ public class TeacherMusicSheetAuditReq {
     @NotNull(message = "曲目id不能为空 ")
     private Long musicSheetId;
 
-    @ApiModelProperty(value = "审批状态（1：通过，2：不通过）",required = true)
+    @ApiModelProperty(value = "审批状态（2：通过，3：不通过）",required = true)
     @NotNull(message = "审批状态不为空 ")
-    private AuditEnum auditStatus;
+    private AuthStatusEnum authStatus;
 
     @ApiModelProperty(value = "审核理由",required = true)
     @NotBlank(message = "审核理由不能为空 ")
@@ -37,12 +37,12 @@ public class TeacherMusicSheetAuditReq {
         this.musicSheetId = musicSheetId;
     }
 
-    public AuditEnum getAuditStatus() {
-        return auditStatus;
+    public AuthStatusEnum getAuthStatus() {
+        return authStatus;
     }
 
-    public void setAuditStatus(AuditEnum auditStatus) {
-        this.auditStatus = auditStatus;
+    public void setAuthStatus(AuthStatusEnum authStatus) {
+        this.authStatus = authStatus;
     }
 
     public String getRemark() {

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

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
+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;
@@ -28,7 +28,7 @@ public class MusicAlbumSearch extends QueryInfo{
     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 QueryInfo{
         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/MusicSheetSearch.java

@@ -1,7 +1,7 @@
 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.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;
@@ -35,15 +35,15 @@ public class MusicSheetSearch  extends QueryInfo{
     private List<Long> subjectIdList;
 
     @ApiModelProperty("曲目状态（0：停用，1：启用））")
-    private StateEnum state;
+    private YesOrNoEnum state;
 
     @ApiModelProperty("曲目审核状态(0:待审核;1:通过;2:未通过)")
-    private AuditEnum auditStatus;
+    private AuthStatusEnum auditStatus;
 
     @ApiModelProperty(value = "创建人id （老师id）")
     private Long createBy;
 
-    @ApiModelProperty(value = "假删除 0 : 未删除 1：已删除",hidden = true)
+    @ApiModelProperty(value = "假删除 false : 未删除 true：已删除",hidden = true)
     private Boolean delFlag = false;
 
     public String getIdAndName() {
@@ -92,19 +92,19 @@ public class MusicSheetSearch  extends QueryInfo{
         }
     }
 
-    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;
     }
 

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

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
+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;
@@ -17,7 +17,7 @@ public class MusicTagSearch extends QueryInfo{
 	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 QueryInfo{
 		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/TeacherMusicSheetAuditSearch.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
+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;
@@ -36,8 +36,8 @@ public class TeacherMusicSheetAuditSearch extends QueryInfo{
     private Date endTime;
 
 
-    @ApiModelProperty("审核状态（0：审核中，1：已通过，2：已拒绝）")
-    private AuditEnum state;
+    @ApiModelProperty(value = "审核状态  0、未申请 1、审核中 2、通过 3、不通过")
+    private AuthStatusEnum authStatus;
 
     @ApiModelProperty(value = "假删除 0 : 未删除 1：已删除",hidden = true)
     private Boolean delFlag = false;
@@ -74,12 +74,12 @@ public class TeacherMusicSheetAuditSearch extends QueryInfo{
         this.endTime = endTime;
     }
 
-    public AuditEnum getState() {
-        return state;
+    public AuthStatusEnum getAuthStatus() {
+        return authStatus;
     }
 
-    public void setState(AuditEnum state) {
-        this.state = state;
+    public void setAuthStatus(AuthStatusEnum authStatus) {
+        this.authStatus = authStatus;
     }
 
     public Boolean getDelFlag() {

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

@@ -1,12 +1,14 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
+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;
 
 /**
@@ -14,14 +16,16 @@ import java.util.Date;
  * @date: 2022/3/30 11:32
  */
 @ApiModel(value = "VideoLessonGroupSearch", description = "视频课组列表查询")
-public class VideoLessonSearch extends QueryInfo{
+public class VideoLessonSearch extends QueryInfo {
     @ApiModelProperty(value = "视频组id")
+    @NotNull(groups = {SelectGroup.class}, message = "视频组id不能为空")
     private Long videoLessonGroupId;
 
-    @ApiModelProperty(value = "学生id")
-    private Long studentId;
+    @ApiModelProperty(value = "用户id")
+    @NotNull(groups = {AddGroup.class}, message = "用户id不能为空")
+    private Long userId;
 
-    @ApiModelProperty(value = "课程编号/老师编号/老师姓名/老师手机")
+    @ApiModelProperty(value = "课程编号/课程组名称/老师编号/老师姓名/老师手机")
     private String search;
 
     @ApiModelProperty(value = "订单号")
@@ -51,18 +55,20 @@ public class VideoLessonSearch extends QueryInfo{
         this.videoLessonGroupId = videoLessonGroupId;
     }
 
-    public Long getStudentId() {
-        return studentId;
+    public Long getUserId() {
+        return userId;
     }
 
-    public void setStudentId(Long studentId) {
-        this.studentId = studentId;
+    public void setUserId(Long userId) {
+        this.userId = userId;
     }
 
+    @Override
     public String getSearch() {
         return search;
     }
 
+    @Override
     public void setSearch(String search) {
         this.search = search;
     }

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 = "排序号")
@@ -226,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;
 	}
 

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

@@ -4,7 +4,7 @@ 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.AuditEnum;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -26,9 +26,9 @@ public class MusicSheetAuthRecord implements Serializable {
     @ApiModelProperty("曲目id ")
 	@TableField(value = "music_sheet_id_")
     private Long musicSheetId;
-    @ApiModelProperty("审核状态 0:审核中;1:通过;2:未通过 ")
+    @ApiModelProperty("审核状态 DOING:审核中;PASS:通过;UNPASS:未通过 ")
 	@TableField(value = "audit_state_")
-    private AuditEnum auditState;
+    private AuthStatusEnum auditState;
     @ApiModelProperty("审核人 ")
 	@TableField(value = "verify_user_id_")
     private Long verifyUserId;
@@ -60,11 +60,11 @@ public class MusicSheetAuthRecord implements Serializable {
         this.musicSheetId = musicSheetId;
     }
     
-	public AuditEnum getAuditState() {
+	public AuthStatusEnum getAuditState() {
         return auditState;
     }
 
-    public void setAuditState(AuditEnum auditState) {
+    public void setAuditState(AuthStatusEnum auditState) {
         this.auditState = auditState;
     }
     

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,7 +33,7 @@ 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：删除）")
@@ -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/TeacherAuthEntryRecord.java

@@ -80,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;
     /** 

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/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/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/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/EmployeeService.java

@@ -5,10 +5,13 @@ 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.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;
@@ -21,7 +24,7 @@ public interface EmployeeService extends BaseService<Long, Employee> {
      * @updateTime 2022/3/25 11:52
      * @return: com.yonge.cooleshow.biz.dal.entity.Employee
      */
-    Employee detail(Long id);
+    EmployeeVo detail(Long id);
     /***
      * 分页查询
      * @author liweifan
@@ -30,18 +33,18 @@ public interface EmployeeService extends BaseService<Long, Employee> {
      * @updateTime 2022/4/6 13:56
      * @return: com.baomidou.mybatisplus.core.metadata.IPage<com.yonge.cooleshow.biz.dal.entity.Employee>
      */
-    IPage<Employee> selectPage(IPage<Employee> 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/VideoLessonGroupService.java

@@ -24,4 +24,8 @@ public interface VideoLessonGroupService extends IService<VideoLessonGroup> {
     void add(VideoLessonVo lessonVo, SysUser sysUser);
 
     IPage<VideoLessonStudentDetailVo> selectStudentPage(IPage<VideoLessonStudentDetailVo> page, VideoLessonSearch search);
+
+    IPage<VideoLessonTeacherVo> selectTeacherPage(IPage<VideoLessonTeacherVo> page, VideoLessonSearch search);
+
+    IPage<VideoLessonPurchaseVo> selectPurchaseStudent(IPage<VideoLessonPurchaseVo> page, VideoLessonSearch search);
 }

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

@@ -1,17 +1,22 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
+import java.util.Date;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.auth.api.enums.SysUserType;
+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.support.PageUtil;
+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 io.swagger.models.auth.In;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,42 +43,68 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Long, Employee> impleme
     }
 
     @Override
-    public Employee detail(Long id) {
+    public EmployeeVo detail(Long id) {
         return employeeDao.detail(id);
     }
 
     @Override
-    public IPage<Employee> selectPage(IPage<Employee> page, EmployeeSearch employeeSearch) {
+    public IPage<EmployeeVo> selectPage(IPage<EmployeeVo> page, EmployeeSearch employeeSearch) {
         return page.setRecords(employeeDao.selectPage(page, employeeSearch));
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void add(Employee employee) throws Exception {
-        SysUser sysUser = new SysUser();
-        BeanUtils.copyProperties(sysUser,employee);
-        sysUser.setUserType(SysUserType.SYSTEM.getCode());
-        //初始密码，手机号后6位
-        String password = sysUser.getPhone().substring(sysUser.getPhone().length() - 6);
-        sysUser.setPassword(new BCryptPasswordEncoder().encode(password));
-        employeeDao.insertSysUser(sysUser);
+    public HttpResponseResult<EmployeeDto> addEmployee(EmployeeDto param) throws Exception {
+        SysUser sysUser = employeeDao.querySysUserByPhone(param.getPhone());
+        if (sysUser == null) {
+            sysUser = new SysUser();
+            BeanUtils.copyProperties(sysUser, param);
+            sysUser.setUserType(SysUserType.SYSTEM.getCode());
+            //初始密码，手机号后6位
+            String password = sysUser.getPhone().substring(sysUser.getPhone().length() - 6);
+            sysUser.setPassword(new BCryptPasswordEncoder().encode(password));
+            sysUser.setCreateTime(new Date());
+            sysUser.setUpdateTime(new Date());
+            employeeDao.insertSysUser(sysUser);
+        } else {
+            Employee employee = employeeDao.get(sysUser.getId());
+            if (null != employee || sysUser.getUserType().indexOf(SysUserType.SYSTEM.getCode()) > 0) {
+                return HttpResponseResult.failed("该手机号对应用户已经是员工");
+            }
+            sysUser.setUserType(SysUserType.SYSTEM.getCode() + "," + sysUser.getUserType());
+            sysUser.setUpdateTime(new Date());
+            employeeDao.updateSysUser(sysUser);
+        }
+        List<Long> roles = employeeDao.queryUserRole(sysUser.getId());
+        param.getRoleIds().removeAll(roles);
         //新增角色
-        employeeDao.batchAddEmployeeRole(sysUser.getId(),employee.getRoleIds());
+        employeeDao.batchAddEmployeeRole(sysUser.getId(), param.getRoleIds());
         //新增员工表
-        employee.setUserId(sysUser.getId());
-        employeeDao.insert(employee);
+        param.setUserId(sysUser.getId());
+        employeeDao.insert(param);
+        return HttpResponseResult.succeed(param);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateEmployee(Employee employee) throws Exception {
-        SysUser sysUser = new SysUser();
-        BeanUtils.copyProperties(sysUser,employee);
-        sysUser.setId(employee.getUserId());
+    public HttpResponseResult<EmployeeDto> updateEmployee(EmployeeDto param) throws Exception {
+        SysUser sysUser = employeeDao.querySysUserById(param.getUserId());
+        Employee employee = employeeDao.get(sysUser.getId());
+        if(null == sysUser || null == employee){
+            return HttpResponseResult.failed("未找到用户");
+        }
+        SysUser oldPhoneUser = employeeDao.querySysUserByPhone(param.getPhone());
+        if (null != oldPhoneUser && !oldPhoneUser.getId().equals(sysUser.getId())) {
+            return HttpResponseResult.failed("手机号已经有用户使用");
+        }
+        BeanUtils.copyProperties(sysUser, param);
         employeeDao.updateSysUser(sysUser);
 
         employeeDao.delEmployeeRole(employee.getUserId());
-        employeeDao.batchAddEmployeeRole(employee.getUserId(),employee.getRoleIds());
+        employeeDao.batchAddEmployeeRole(employee.getUserId(), param.getRoleIds());
+
+        employeeDao.update(param);
+        return HttpResponseResult.succeed(param);
     }
 
     @Override

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

@@ -2,15 +2,14 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yonge.cooleshow.biz.dal.dao.MusicAlbumDao;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumDetailSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicAlbumSearch;
 import com.yonge.cooleshow.biz.dal.entity.AlbumFavorite;
 import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
-import com.yonge.cooleshow.biz.dal.dao.MusicAlbumDao;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
-
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.AlbumFavoriteService;
 import com.yonge.cooleshow.biz.dal.service.AlbumMusicRelateService;
@@ -23,9 +22,8 @@ import com.yonge.cooleshow.common.exception.BizException;
 import com.yonge.toolset.utils.string.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
@@ -72,10 +70,10 @@ public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao,MusicAlbum>
         if (musicAlbum == null) {
             throw  new BizException("未找到专辑信息");
         }
-        if (StateEnum.STOP.getCode().equals(musicAlbum.getAlbumStatus().getCode())) {
-            musicAlbum.setAlbumStatus(StateEnum.ENABLE);
+        if (YesOrNoEnum.NO.getCode().equals(musicAlbum.getAlbumStatus().getCode())) {
+            musicAlbum.setAlbumStatus(YesOrNoEnum.YES);
         } else {
-            musicAlbum.setAlbumStatus(StateEnum.STOP);
+            musicAlbum.setAlbumStatus(YesOrNoEnum.NO);
         }
         return this.updateById(musicAlbum);
     }

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

@@ -33,7 +33,7 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
         MusicSheetAuthRecord musicSheetAuthRecord = new MusicSheetAuthRecord();
         musicSheetAuthRecord.setMusicSheetId(param.getMusicSheetId());
         musicSheetAuthRecord.setCreateTime(new Date());
-        musicSheetAuthRecord.setAuditState(param.getAuditStatus());
+        musicSheetAuthRecord.setAuditState(param.getAuthStatus());
         musicSheetAuthRecord.setReason(param.getRemark());
         musicSheetAuthRecord.setVerifyUserId(userId);
         return this.save(musicSheetAuthRecord);

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

@@ -9,10 +9,7 @@ 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.*;
 import com.yonge.cooleshow.biz.dal.entity.*;
-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.YesOrNoEnum;
+import com.yonge.cooleshow.biz.dal.enums.*;
 import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.*;
@@ -73,7 +70,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
         BeanUtils.copyProperties(musicSheetDto, musicSheet);
         //保存主表
         musicSheet.setCreateBy(sysUser.getId());
-        musicSheet.setState(StateEnum.STOP);
+        musicSheet.setState(YesOrNoEnum.NO);
         musicSheet.setCreateTime(new Date());
         int count = musicSheetDao.insert(musicSheet);
 
@@ -99,10 +96,10 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
         if (musicSheet == null) {
             throw  new BizException("未找到曲目信息");
         }
-        if (StateEnum.STOP.getCode().equals(musicSheet.getState().getCode())) {
-            musicSheet.setState(StateEnum.ENABLE);
+        if (YesOrNoEnum.NO.getCode().equals(musicSheet.getState().getCode())) {
+            musicSheet.setState(YesOrNoEnum.YES);
         } else {
-            musicSheet.setState(StateEnum.STOP);
+            musicSheet.setState(YesOrNoEnum.NO);
         }
         return this.updateById(musicSheet);
 
@@ -118,8 +115,8 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
         MusicSheetSearch query = new MusicSheetSearch();
         // 设置只查老师用户
         query.setCreateBy(sysUser.getId());
-        query.setAuditStatus(AuditEnum.OPEN);
-        query.setState(StateEnum.ENABLE);
+        query.setAuditStatus(AuthStatusEnum.PASS);
+        query.setState(YesOrNoEnum.YES);
         // 只查3条
         query.setRows(3);
         IPage<MusicSheetVo> musicSheetVoIPage = selectPage(PageUtil.getPage(query), query);
@@ -238,7 +235,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
         }
 
         if (musicSheetAuthRecordService.audit(param,userId)) {
-            musicSheet.setAuditStatus(param.getAuditStatus());
+            musicSheet.setAuditStatus(param.getAuthStatus());
             return this.updateById(musicSheet);
         } else {
             return false;

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

@@ -1,6 +1,5 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -10,8 +9,6 @@ import com.yonge.cooleshow.biz.dal.dao.MusicTagDao;
 import com.yonge.cooleshow.biz.dal.dto.MusicTagSaveDto;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicTagSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicTag;
-import com.yonge.cooleshow.biz.dal.enums.OpenEnum;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.MusicTagService;
 import com.yonge.cooleshow.biz.dal.vo.MusicTagVo;
@@ -66,7 +63,7 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
                          musicTagVo.setChildren(childrenList);
                      } else {
                          // 如果名称查询中，父级不包含名称/编号，子集包含，只展示包含的子集，并且默认展开子集列表
-                         musicTagVo.setOpen(OpenEnum.OPEN);
+                         musicTagVo.setOpen(YesOrNoEnum.YES);
                          List<MusicTagVo> childrenNameList = childrenList.stream()
                                                                 .filter(vo -> vo.getName().contains(query.getIdAndName())
                                                                         ||vo.getId().toString().contains(query.getIdAndName()))
@@ -98,10 +95,10 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
         }
         MusicTag musicTag = new MusicTag();
         musicTag.setId(musicTagId);
-        if (tag.getState().getCode().equals(StateEnum.STOP.getCode())) {
-            musicTag.setState(StateEnum.ENABLE);
+        if (tag.getState().getCode().equals(YesOrNoEnum.NO.getCode())) {
+            musicTag.setState(YesOrNoEnum.YES);
         } else {
-            musicTag.setState(StateEnum.STOP);
+            musicTag.setState(YesOrNoEnum.NO);
         }
         return this.updateById(musicTag);
     }
@@ -117,7 +114,7 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         MusicTag musicTag = new MusicTag();
         musicTag.setDelFlag(false);
-        musicTag.setState(StateEnum.STOP);
+        musicTag.setState(YesOrNoEnum.NO);
         if (musicTagSaveDto.getParentTagId() == null) {
             musicTag.setParentTagId(0L);
         } else {
@@ -173,7 +170,7 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
     public List<MusicTagVo> selectMusicTagTree() {
         List<MusicTag> list = this.lambdaQuery()
                 .eq(MusicTag::getDelFlag,YesOrNoEnum.NO.getCode())
-                .eq(MusicTag::getState,StateEnum.ENABLE.getCode())
+                .eq(MusicTag::getState,YesOrNoEnum.YES.getCode())
                 .list();
         if (list == null) {
             return new ArrayList<>();

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

@@ -9,10 +9,7 @@ import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup;
 import com.yonge.cooleshow.biz.dal.dao.VideoLessonGroupDao;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupService;
-import com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupUpVo;
-import com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupVo;
-import com.yonge.cooleshow.biz.dal.vo.VideoLessonStudentDetailVo;
-import com.yonge.cooleshow.biz.dal.vo.VideoLessonVo;
+import com.yonge.cooleshow.biz.dal.vo.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -29,7 +26,7 @@ import java.util.List;
  * @version v1.0
  **/
 @Service
-public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao,VideoLessonGroup> implements VideoLessonGroupService {
+public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao, VideoLessonGroup> implements VideoLessonGroupService {
 
     private final static Logger log = LoggerFactory.getLogger(VideoLessonGroupServiceImpl.class);
 
@@ -43,20 +40,20 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
     }
 
     /**
-    * @Description: 查询视频课组
-    * @Author: cy
-    * @Date: 2022/3/31
-    */
+     * @Description: 查询视频课组
+     * @Author: cy
+     * @Date: 2022/3/31
+     */
     @Override
     public IPage<VideoLessonGroupVo> selectPage(IPage<VideoLessonGroupVo> page, VideoLessonGroupSearch query) {
-        return page.setRecords(baseMapper.selectPage(page,query));
+        return page.setRecords(baseMapper.selectPage(page, query));
     }
 
     /**
-    * @Description: 修改视频课组
-    * @Author: cy
-    * @Date: 2022/3/31
-    */
+     * @Description: 修改视频课组
+     * @Author: cy
+     * @Date: 2022/3/31
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateGroup(VideoLessonGroupUpVo lessonGroupUpVo) {
@@ -64,10 +61,10 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
     }
 
     /**
-    * @Description: 删除视频课
-    * @Author: cy
-    * @Date: 2022/3/31
-    */
+     * @Description: 删除视频课
+     * @Author: cy
+     * @Date: 2022/3/31
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteGroup(Long id) {
@@ -76,10 +73,10 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
     }
 
     /**
-    * @Description: 新增视频课组&视频课
-    * @Author: cy
-    * @Date: 2022/4/1
-    */
+     * @Description: 新增视频课组&视频课
+     * @Author: cy
+     * @Date: 2022/4/1
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void add(VideoLessonVo lessonVo, SysUser sysUser) {
@@ -105,12 +102,32 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
     }
 
     /**
-    * @Description: 查询学员购买视频课
-    * @Author: cy
-    * @Date: 2022/4/2
-    */
+     * @Description: 学员详情-查询视频课列表
+     * @Author: cy
+     * @Date: 2022/4/2
+     */
     @Override
     public IPage<VideoLessonStudentDetailVo> selectStudentPage(IPage<VideoLessonStudentDetailVo> page, VideoLessonSearch search) {
-        return page.setRecords(baseMapper.selectStudentPage(page,search));
+        return page.setRecords(baseMapper.selectStudentPage(page, search));
+    }
+
+    /**
+     * @Description: 老师详情-查询视频课列表
+     * @Author: cy
+     * @Date: 2022/4/6
+     */
+    @Override
+    public IPage<VideoLessonTeacherVo> selectTeacherPage(IPage<VideoLessonTeacherVo> page, VideoLessonSearch search) {
+        return page.setRecords(baseMapper.selectTeacherPage(page, search));
+    }
+
+    /**
+     * @Description: 老师详情-视频课详情-查询购买学员列表
+     * @Author: cy
+     * @Date: 2022/4/6
+     */
+    @Override
+    public IPage<VideoLessonPurchaseVo> selectPurchaseStudent(IPage<VideoLessonPurchaseVo> page, VideoLessonSearch search) {
+        return page.setRecords(baseMapper.selectPurchaseStudent(page, search));
     }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/valid/SelectGroup.java

@@ -0,0 +1,8 @@
+package com.yonge.cooleshow.biz.dal.valid;
+
+/**
+* @Author: cy
+* @Date: 2022/4/6
+*/
+public interface SelectGroup {
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/EmployeeVo.java

@@ -0,0 +1,78 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+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 java.util.List;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-04-06 16:04:57
+ */
+@ApiModel(value = "EmployeeVo对象", description = "员工表查询视图对象")
+public class EmployeeVo extends Employee {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty("昵称")
+    private String username;
+    @ApiModelProperty(value = "性别 0女 1男")
+    private GenderEnum gender;
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+    @ApiModelProperty(value = "0-正常，9-锁定")
+    private UserLockFlag lockFlag;
+    @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 UserLockFlag getLockFlag() {
+        return lockFlag;
+    }
+
+    public void setLockFlag(UserLockFlag lockFlag) {
+        this.lockFlag = lockFlag;
+    }
+
+    public List<Long> getRoleIds() {
+        return roleIds;
+    }
+
+    public void setRoleIds(List<Long> roleIds) {
+        this.roleIds = roleIds;
+    }
+
+    public EmployeeVo buildVo(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/vo/MusicTagVo.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
 import com.yonge.cooleshow.biz.dal.entity.MusicTag;
-import com.yonge.cooleshow.biz.dal.enums.OpenEnum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -19,17 +19,17 @@ public class MusicTagVo extends MusicTag{
 	@ApiModelProperty("更新人")
 	private String updateName;
 
-	@ApiModelProperty("是否展开标签（0:展开，1：不展开）")
-	private OpenEnum open = OpenEnum.CLOSE;
+	@ApiModelProperty("是否展开标签（1:展开，0：不展开）")
+	private YesOrNoEnum open =YesOrNoEnum.YES;
 
 	@ApiModelProperty("二级标签")
 	private List<MusicTagVo> children = new ArrayList<>();
 
-	public OpenEnum getOpen() {
+	public YesOrNoEnum getOpen() {
 		return open;
 	}
 
-	public void setOpen(OpenEnum open) {
+	public void setOpen(YesOrNoEnum open) {
 		this.open = open;
 	}
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/TeacherHomeVo.java

@@ -34,9 +34,9 @@ public class TeacherHomeVo implements Serializable {
     private Integer expTime;
     @ApiModelProperty("未上课时")
     private Integer unExpTime;
-    @ApiModelProperty("老师入驻状态 0、未申请  1、审核中 2、通过 3、不通过 ")
+    @ApiModelProperty("老师入驻状态 0、未申请  UNPAALY、未申请 DOING、审核中 PASS、通过 UNPASS、不通过")
     private AuthStatusEnum entryStatus;
-    @ApiModelProperty("音乐人审核状态  0、未申请 1、审核中 2、通过 3、不通过 ")
+    @ApiModelProperty("音乐人审核状态  0、未申请 UNPAALY、未申请 DOING、审核中 PASS、通过 UNPASS、不通过")
     private AuthStatusEnum musicianAuthStatus;
     @ApiModelProperty("是否有直播权限 0 否 1 是")
     private YesOrNoEnum liveFlag;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/TeacherMusicSheetVo.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
-import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
@@ -48,8 +48,8 @@ public class TeacherMusicSheetVo {
     @ApiModelProperty(value = "创建时间")
     private java.util.Date createTime;  //创建时间
 
-    @ApiModelProperty(value = "审核状态(0:待审核;1:通过;2:未通过)")
-    private AuditEnum auditStatus;  //审核状态(0:待审核;1:通过;2:未通过)
+    @ApiModelProperty(value = "审核状态(DOING:待审核;PASS:通过;UNPASS:未通过)")
+    private AuthStatusEnum auditStatus;
 
     @ApiModelProperty("审批人姓名")
     private String auditName;
@@ -143,11 +143,11 @@ public class TeacherMusicSheetVo {
         this.createTime = createTime;
     }
 
-    public AuditEnum getAuditStatus() {
+    public AuthStatusEnum getAuditStatus() {
         return auditStatus;
     }
 
-    public void setAuditStatus(AuditEnum auditStatus) {
+    public void setAuditStatus(AuthStatusEnum auditStatus) {
         this.auditStatus = auditStatus;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/VideoLessonPurchaseVo.java

@@ -0,0 +1,67 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.yonge.cooleshow.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author: cy
+ * @date: 2022/3/30 11:39
+ */
+@ApiModel(value = "VideoLessonPurchaseVo对象")
+public class VideoLessonPurchaseVo extends BaseEntity {
+    @ApiModelProperty("学员编号")
+    private String studentId;
+
+    @ApiModelProperty("学员姓名")
+    private String username;
+
+    @ApiModelProperty(value = "支付金额")
+    private String payMoney;
+
+    @ApiModelProperty(value = "订单号")
+    private String orderNo;
+
+    @ApiModelProperty(value = "购买时间")
+    private String purchaseTime;
+
+    public String getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(String studentId) {
+        this.studentId = studentId;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPayMoney() {
+        return payMoney;
+    }
+
+    public void setPayMoney(String payMoney) {
+        this.payMoney = payMoney;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getPurchaseTime() {
+        return purchaseTime;
+    }
+
+    public void setPurchaseTime(String purchaseTime) {
+        this.purchaseTime = purchaseTime;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/VideoLessonTeacherVo.java

@@ -0,0 +1,111 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.yonge.cooleshow.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author: cy
+ * @date: 2022/4/6 10:45
+ */
+@ApiModel(value = "VideoLessonTeacherVo对象")
+public class VideoLessonTeacherVo extends BaseEntity {
+    @ApiModelProperty(value = "课程组编号")
+    private String groupId;
+
+    @ApiModelProperty("课程名称")
+    private String lessonName;
+
+    @ApiModelProperty("课程声部")
+    private String lessonSubject;
+
+    @ApiModelProperty("课时数")
+    private Integer lessonCount;
+
+    @ApiModelProperty("销售价格")
+    private String lessonPrice;
+
+    @ApiModelProperty("购买人数")
+    private Integer countStudent;
+
+    @ApiModelProperty("审核状态(0:待审核 1:通过 2:未通过)")
+    private Integer auditStatus;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+    @ApiModelProperty("课程介绍")
+    private String lessonDesc;
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
+    public String getLessonName() {
+        return lessonName;
+    }
+
+    public void setLessonName(String lessonName) {
+        this.lessonName = lessonName;
+    }
+
+    public String getLessonSubject() {
+        return lessonSubject;
+    }
+
+    public void setLessonSubject(String lessonSubject) {
+        this.lessonSubject = lessonSubject;
+    }
+
+    public Integer getLessonCount() {
+        return lessonCount;
+    }
+
+    public void setLessonCount(Integer lessonCount) {
+        this.lessonCount = lessonCount;
+    }
+
+    public String getLessonPrice() {
+        return lessonPrice;
+    }
+
+    public void setLessonPrice(String lessonPrice) {
+        this.lessonPrice = lessonPrice;
+    }
+
+    public Integer getCountStudent() {
+        return countStudent;
+    }
+
+    public void setCountStudent(Integer countStudent) {
+        this.countStudent = countStudent;
+    }
+
+    public Integer getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(Integer auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getLessonDesc() {
+        return lessonDesc;
+    }
+
+    public void setLessonDesc(String lessonDesc) {
+        this.lessonDesc = lessonDesc;
+    }
+}

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

@@ -60,7 +60,7 @@
         , t.contact_address_ as "contactAddress"
         </sql>
 
-    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.entity.Employee">
+    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.EmployeeVo">
         SELECT
             <include refid="baseColumns" />,
             username_ as username,
@@ -71,7 +71,7 @@
         where t.user_id_ = #{id}
     </select>
 
-    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.entity.Employee">
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.EmployeeVo">
         SELECT
             <include refid="baseColumns" />,
             u.username_ as username,
@@ -259,7 +259,6 @@
     </select>
 
 
-
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="Employee">
 		SELECT * FROM employee WHERE user_id_ = #{userId}

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

@@ -390,8 +390,8 @@
             <if test="param.auditName != null and param.auditName != ''">
                 and su2.username_ like concat('%',#{param.auditName},'%')
             </if>
-            <if test="param.state != null">
-                and ms.audit_status_ = #{param.state}
+            <if test="param.authStatus != null">
+                and ms.audit_status_ = #{param.authStatus}
             </if>
             <if test="param.startTime != null">
                 and ms.create_time_ &gt; #{param.startTime}

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.VideoLessonGroupDao">
 	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup">
@@ -86,8 +86,8 @@
 		LEFT JOIN video_lesson_purchase_record p ON g.id_ = p.video_lesson_group_id_
 		LEFT JOIN sys_user s ON g.teacher_id_ = s.id_
 		<where>
-			<if test="param.studentId !=null">
-				AND p.student_id_ = #{param.studentId}
+			<if test="param.userId !=null">
+				AND p.student_id_ = #{param.userId}
 			</if>
 			<if test="null != param.search and '' != param.search">
 				AND (
@@ -114,4 +114,65 @@
 			</if>
 		</where>
 	</select>
+	<select id="selectTeacherPage" resultType="com.yonge.cooleshow.biz.dal.vo.VideoLessonTeacherVo">
+		SELECT
+			g.id_ AS groupId,
+			g.lesson_name_ AS lessonName,
+			g.lesson_subject_ AS lessonSubject,
+			g.lesson_count_ AS lessonCount,
+			g.lesson_price_ AS lessonPrice,
+			g.audit_status_ AS auditStatus,
+			(SELECT COUNT(1) FROM video_lesson_purchase_record r WHERE r.video_lesson_group_id_=g.id_) AS countStudent,
+			g.create_time_ AS createTime,
+			g.lesson_desc_ AS lessonDesc
+		FROM video_lesson_group g
+		<where>
+			<if test="param.userId !=null">
+				AND g.teacher_id_ = #{param.userId}
+			</if>
+			<if test="null != param.search and '' != param.search">
+				AND (
+				g.id_ LIKE CONCAT('%', #{param.search}, '%') OR
+				g.lesson_name_ LIKE CONCAT('%', #{param.search}, '%')
+				)
+			</if>
+			<if test="null != param.lessonSubject and '' != param.lessonSubject">
+				AND g.lesson_subject_ = #{param.lessonSubject}
+			</if>
+			<if test="param.auditStatus !=null">
+				AND g.audit_status_ = #{param.auditStatus}
+			</if>
+		</where>
+	</select>
+	<select id="selectPurchaseStudent" resultType="com.yonge.cooleshow.biz.dal.vo.VideoLessonPurchaseVo">
+		SELECT
+			p.student_id_ AS studentId,
+			u.username_ AS username,
+			p.pay_money_ AS payMoney,
+			p.order_no_ AS orderNo,
+			p.purchase_time_ AS purchaseTime
+		FROM video_lesson_purchase_record p
+		LEFT JOIN sys_user u ON p.student_id_ = u.id_
+		<where>
+			<if test="param.videoLessonGroupId !=null">
+				AND p.video_lesson_group_id_ = #{param.videoLessonGroupId}
+			</if>
+			<if test="null != param.search and '' != param.search">
+				AND (
+				u.id_ LIKE CONCAT('%', #{param.search}, '%') OR
+				u.username_ LIKE CONCAT('%', #{param.search}, '%') OR
+				u.phone_ LIKE CONCAT('%', #{param.search}, '%')
+				)
+			</if>
+			<if test="null != param.orderNo and '' != param.orderNo">
+				AND p.order_no_ = #{param.orderNo}
+			</if>
+			<if test="param.startTime !=null">
+				<![CDATA[AND p.purchase_time_ >= #{param.startTime} ]]>
+			</if>
+			<if test="param.endTime !=null">
+				<![CDATA[AND p.purchase_time_ <= #{param.endTime} ]]>
+			</if>
+		</where>
+	</select>
 </mapper>

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

@@ -6,16 +6,15 @@ 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.dto.search.StudentMusicAlbumSearch;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
 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.common.page.QueryInfo;
 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.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -48,7 +47,7 @@ public class MusicAlbumController extends BaseController {
         if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
-        query.setAlbumStatus(StateEnum.ENABLE);
+        query.setAlbumStatus(YesOrNoEnum.YES);
         IPage<MusicAlbumVo> iPage = musicAlbumService.selectPage(PageUtil.getPage(query),query);
         return succeed(PageUtil.pageInfo(iPage));
     }
@@ -65,7 +64,7 @@ public class MusicAlbumController extends BaseController {
             return failed("用户信息获取失败");
         }
         query.setType(2);
-        query.setState(StateEnum.ENABLE);
+        query.setState(YesOrNoEnum.YES);
         YesOrNoEnum yesOrNoEnum = musicAlbumService.checkFavorite(sysUser.getId(),query.getId() );
         AlbumDetailVo albumDetailVo = musicAlbumService.detail(PageUtil.getPage(query), query);
         albumDetailVo.setFavorite(yesOrNoEnum);
@@ -99,7 +98,7 @@ public class MusicAlbumController extends BaseController {
         }
         StudentMusicAlbumSearch search = new StudentMusicAlbumSearch();
         search.setStudentId(sysUser.getId());
-        search.setAlbumStatus(StateEnum.ENABLE);
+        search.setAlbumStatus(YesOrNoEnum.YES);
         IPage<MusicAlbumVo> albumVoIPage = musicAlbumService.favoriteAlbum(PageUtil.getPage(query), search);
         return succeed(PageUtil.pageInfo(albumVoIPage));
     }

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

@@ -5,16 +5,16 @@ 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.search.StudentMusicSheetSearch;
-import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
-import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -60,8 +60,8 @@ public class MusicSheetController extends BaseController {
         }
 
         // 学生 只能看通过审核 并且 启用的 曲目
-        query.setState(StateEnum.ENABLE);
-        query.setAuditStatus(AuditEnum.OPEN);
+        query.setState(YesOrNoEnum.YES);
+        query.setAuditStatus(AuthStatusEnum.PASS);
         query.setStudentId(sysUser.getId());
         IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectStudentPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(musicSheetVoIPage));
@@ -94,8 +94,8 @@ public class MusicSheetController extends BaseController {
         }
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
         search.setStudentId(sysUser.getId());
-        search.setState(StateEnum.ENABLE);
-        search.setAuditStatus(AuditEnum.OPEN);
+        search.setState(YesOrNoEnum.YES);
+        search.setAuditStatus(AuthStatusEnum.PASS);
         IPage<MusicSheetVo> sheetVoIPage = musicSheetService.myMusic(PageUtil.getPage(query),search);
         return succeed(PageUtil.pageInfo(sheetVoIPage));
     }
@@ -113,8 +113,8 @@ public class MusicSheetController extends BaseController {
         }
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
         search.setStudentId(sysUser.getId());
-        search.setState(StateEnum.ENABLE);
-        search.setAuditStatus(AuditEnum.OPEN);
+        search.setState(YesOrNoEnum.YES);
+        search.setAuditStatus(AuthStatusEnum.PASS);
         IPage<MusicSheetVo> sheetVoIPage = musicSheetService.favoriteMusic(PageUtil.getPage(query),search);
         return succeed(PageUtil.pageInfo(sheetVoIPage));
     }
@@ -132,8 +132,8 @@ public class MusicSheetController extends BaseController {
         }
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
         search.setStudentId(sysUser.getId());
-        search.setState(StateEnum.ENABLE);
-        search.setAuditStatus(AuditEnum.OPEN);
+        search.setState(YesOrNoEnum.YES);
+        search.setAuditStatus(AuthStatusEnum.PASS);
         IPage<MusicSheetVo> sheetVoIPage = musicSheetService.practiceMusic(PageUtil.getPage(query),search);
         return succeed(PageUtil.pageInfo(sheetVoIPage));
     }

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

@@ -8,10 +8,7 @@ import com.yonge.cooleshow.biz.dal.dto.MusicSheetDto;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
 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.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
@@ -76,7 +73,7 @@ public class MusicSheetController extends BaseController {
         }
 
         musicSheetDto.setUserId(sysUser.getId());
-        musicSheetDto.setAuditStatus(AuditEnum.AUDITING);
+        musicSheetDto.setAuditStatus(AuthStatusEnum.DOING);
         List<MusicSheetAccompaniment> list;
         if (!AudioTypeEnum.MIDI.getCode().equals(musicSheetDto.getAudioType().getCode())){
             list = musicSheetDto.getBackground();
@@ -89,7 +86,7 @@ public class MusicSheetController extends BaseController {
             BeanUtils.copyProperties(musicSheetDto, musicSheet);
             musicSheet.setCreateBy(sysUser.getId());
             musicSheet.setCreateTime(new Date());
-            musicSheet.setState(StateEnum.STOP);
+            musicSheet.setState(YesOrNoEnum.NO);
             musicSheetService.save(musicSheet);
         }
         return succeed("新增曲谱成功");