所有接口改为枚举，接口地址首字母大写问题修改

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

@@ -22,7 +22,7 @@ import javax.validation.Valid;
 import java.util.List;
 
 @RestController
-@RequestMapping("/Student")
+@RequestMapping("/student")
 @Api(value = "学生表", tags = "学生表")
 public class StudentController extends BaseController {
     @Autowired

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

@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 
 @RestController
-@RequestMapping("/TeacherAuthEntryRecord")
+@RequestMapping("/teacherAuthEntryRecord")
 @Api(value = "老师入驻审核表", tags = "老师入驻审核表")
 public class TeacherAuthEntryRecordController extends BaseController {
     @Autowired

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

@@ -25,7 +25,7 @@ import javax.validation.Valid;
 import java.util.List;
 
 @RestController
-@RequestMapping("/TeacherAuthMusicianRecord")
+@RequestMapping("/teacherAuthMusicianRecord")
 @Api(value = "老师音乐人审核表", tags = "老师音乐人审核表")
 public class TeacherAuthMusicianRecordController extends BaseController {
 

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

@@ -24,7 +24,7 @@ import javax.validation.Valid;
 import java.util.List;
 
 @RestController
-@RequestMapping("/Teacher")
+@RequestMapping("/teacher")
 @Api(value = "教师表", tags = "教师表")
 public class TeacherController extends BaseController {
 

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

@@ -34,4 +34,12 @@ public interface TeacherAuthEntryRecordDao extends BaseMapper<TeacherAuthEntryRe
 	 * @return: com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo
 	 */
     TeacherAuthEntryRecordVo detail(@Param("id") Long id);
+	/***
+	 * 查询最近一条申请记录
+	 * @author liweifan
+	 * @param: userId
+	 * @updateTime 2022/3/25 16:08
+	 * @return: com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord
+	 */
+	TeacherAuthEntryRecordVo getLastRecordByUserId(@Param("userId") Long userId);
 }

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

@@ -28,4 +28,5 @@ public interface TeacherAuthMusicianRecordDao extends BaseMapper<TeacherAuthMusi
 	 */
 	List<MusicianAuthEntryRecordVo> selectPage(IPage page, AuthEntryRecordSearch authEntryRecordSearch);
 
+    TeacherAuthMusicianRecord getLastRecordByUserId(@Param("userId") Long userId);
 }

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

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -26,7 +27,7 @@ public class AuthEntryRecordSearch {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endTime;
     @ApiModelProperty(value = "审核状态  1、审核中 2、通过 3、不通过")
-    private Integer authStatus;
+    private AuthStatusEnum authStatus;
 
     public String getSearch() {
         return search;
@@ -60,11 +61,11 @@ public class AuthEntryRecordSearch {
         this.endTime = endTime;
     }
 
-    public Integer getAuthStatus() {
+    public AuthStatusEnum getAuthStatus() {
         return authStatus;
     }
 
-    public void setAuthStatus(Integer authStatus) {
+    public void setAuthStatus(AuthStatusEnum authStatus) {
         this.authStatus = authStatus;
     }
 }

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

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 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;
@@ -20,7 +21,7 @@ public class EmployeeSearch {
     @ApiModelProperty("学员声部 ")
     private String subjectIdList;
     @ApiModelProperty(value = "0-正常，9-锁定")
-    private Integer lockFlag;
+    private YesOrNoEnum lockFlag;
     @ApiModelProperty(value = "创建开始时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -54,11 +55,11 @@ public class EmployeeSearch {
         this.subjectIdList = subjectIdList;
     }
 
-    public Integer getLockFlag() {
+    public YesOrNoEnum getLockFlag() {
         return lockFlag;
     }
 
-    public void setLockFlag(Integer lockFlag) {
+    public void setLockFlag(YesOrNoEnum lockFlag) {
         this.lockFlag = lockFlag;
     }
 

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

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 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;
@@ -20,7 +21,7 @@ public class StudentSearch {
     @ApiModelProperty("学员声部 ")
     private String subjectIdList;
     @ApiModelProperty(value = "是否会员 0否 1是")
-    private Boolean isVip;
+    private YesOrNoEnum isVip;
     @ApiModelProperty(value = "注册开始时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -54,12 +55,12 @@ public class StudentSearch {
         this.subjectIdList = subjectIdList;
     }
 
-    public Boolean getVip() {
+    public YesOrNoEnum getIsVip() {
         return isVip;
     }
 
-    public void setVip(Boolean vip) {
-        isVip = vip;
+    public void setIsVip(YesOrNoEnum isVip) {
+        this.isVip = isVip;
     }
 
     public Date getStartTime() {

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

@@ -7,6 +7,8 @@ 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;
 
@@ -62,19 +64,42 @@ public class Teacher implements Serializable {
 	@TableField(value = "subject_id_")
     private String subjectId;
     /**
-     * 老师类型 tourist 游客 entry 认证老师 musician 音乐人
+     * 个人介绍
      */
-    @ApiModelProperty("老师类型 tourist 游客 entry 认证老师 musician 音乐人 ")
-    @TableField(value = "teacher_type_")
-    private String teacherType;
-
-    /** 
-    * 老师入驻状态  1、审核中 2、通过 3、不通过 
-    */
-    @ApiModelProperty("老师入驻状态  1、审核中 2、通过 3、不通过 ")
-	@TableField(value = "entry_status_")
-    private Integer entryStatus;
-    /** 
+    @ApiModelProperty("个人介绍 ")
+    @TableField(value = "introduction_")
+    private String introduction;
+    /**
+     * 学校专业
+     */
+    @ApiModelProperty("学校专业 ")
+    @TableField(value = "subject_")
+    private String subject;
+    /**
+     * 毕业证书
+     */
+    @ApiModelProperty("毕业证书 ")
+    @TableField(value = "grad_certificate_")
+    private String gradCertificate;
+    /**
+     * 学位证书
+     */
+    @ApiModelProperty("学位证书 ")
+    @TableField(value = "degree__certificate_")
+    private String degreeCertificate;
+    /**
+     * 教师资格证
+     */
+    @ApiModelProperty("教师资格证 ")
+    @TableField(value = "teacher__certificate_")
+    private String teacherCertificate;
+    /**
+     * 老师入驻  0 否 1 是
+     */
+    @ApiModelProperty("老师入驻  0 否 1 是 ")
+    @TableField(value = "entry_flag_")
+    private YesOrNoEnum entryFlag;
+    /**
     * 入驻时间 
     */
     @ApiModelProperty("入驻时间 ")
@@ -82,58 +107,28 @@ public class Teacher implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date entryAuthDate;
+
     /** 
-    * 个人介绍 
-    */
-    @ApiModelProperty("个人介绍 ")
-	@TableField(value = "introduction_")
-    private String introduction;
-    /** 
-    * 音乐人审核状态   1、审核中 2、通过 3、不通过 
+    * 音乐人  0 否 1 是
     */
-    @ApiModelProperty("音乐人审核状态   1、审核中 2、通过 3、不通过 ")
-	@TableField(value = "musician_auth_status_")
-    private Integer musicianAuthStatus;
+    @ApiModelProperty("音乐人  0 否 1 是 ")
+	@TableField(value = "musician_flag_")
+    private YesOrNoEnum musicianFlag;
     /**
-     * 直播权限 0 否 1 是
+     * 音乐人认证时间
      */
-    @ApiModelProperty("直播权限 0 否 1 是")
-    @TableField(value = "live_flag_")
-    private Integer liveFlag;
-
-    /** 
-    * 音乐人认证时间 
-    */
     @ApiModelProperty("音乐人认证时间 ")
-	@TableField(value = "musician_date_")
+    @TableField(value = "musician_date_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date musicianDate;
-    /** 
-    * 学校专业 
-    */
-    @ApiModelProperty("学校专业 ")
-	@TableField(value = "subject_")
-    private String subject;
-    /** 
-    * 毕业证书 
-    */
-    @ApiModelProperty("毕业证书 ")
-	@TableField(value = "grad_certificate_")
-    private String gradCertificate;
-    /** 
-    * 学位证书 
-    */
-    @ApiModelProperty("学位证书 ")
-	@TableField(value = "degree__certificate_")
-    private String degreeCertificate;
-    /** 
-    * 教师资格证 
-    */
-    @ApiModelProperty("教师资格证 ")
-	@TableField(value = "teacher__certificate_")
-    private String teacherCertificate;
-    /** 
+    /**
+     * 直播权限 0 否 1 是
+     */
+    @ApiModelProperty("直播权限 0 否 1 是")
+    @TableField(value = "live_flag_")
+    private YesOrNoEnum liveFlag;
+    /**
     * 备注 
     */
     @ApiModelProperty("备注 ")
@@ -196,22 +191,6 @@ public class Teacher implements Serializable {
         this.subjectId = subjectId;
     }
 
-    public Integer getEntryStatus() {
-        return entryStatus;
-    }
-
-    public void setEntryStatus(Integer entryStatus) {
-        this.entryStatus = entryStatus;
-    }
-
-    public Date getEntryAuthDate() {
-        return entryAuthDate;
-    }
-
-    public void setEntryAuthDate(Date entryAuthDate) {
-        this.entryAuthDate = entryAuthDate;
-    }
-
     public String getIntroduction() {
         return introduction;
     }
@@ -220,22 +199,6 @@ public class Teacher implements Serializable {
         this.introduction = introduction;
     }
 
-    public Integer getMusicianAuthStatus() {
-        return musicianAuthStatus;
-    }
-
-    public void setMusicianAuthStatus(Integer musicianAuthStatus) {
-        this.musicianAuthStatus = musicianAuthStatus;
-    }
-
-    public Date getMusicianDate() {
-        return musicianDate;
-    }
-
-    public void setMusicianDate(Date musicianDate) {
-        this.musicianDate = musicianDate;
-    }
-
     public String getSubject() {
         return subject;
     }
@@ -268,6 +231,46 @@ public class Teacher implements Serializable {
         this.teacherCertificate = teacherCertificate;
     }
 
+    public YesOrNoEnum getEntryFlag() {
+        return entryFlag;
+    }
+
+    public void setEntryFlag(YesOrNoEnum entryFlag) {
+        this.entryFlag = entryFlag;
+    }
+
+    public Date getEntryAuthDate() {
+        return entryAuthDate;
+    }
+
+    public void setEntryAuthDate(Date entryAuthDate) {
+        this.entryAuthDate = entryAuthDate;
+    }
+
+    public YesOrNoEnum getMusicianFlag() {
+        return musicianFlag;
+    }
+
+    public void setMusicianFlag(YesOrNoEnum musicianFlag) {
+        this.musicianFlag = musicianFlag;
+    }
+
+    public Date getMusicianDate() {
+        return musicianDate;
+    }
+
+    public void setMusicianDate(Date musicianDate) {
+        this.musicianDate = musicianDate;
+    }
+
+    public YesOrNoEnum getLiveFlag() {
+        return liveFlag;
+    }
+
+    public void setLiveFlag(YesOrNoEnum liveFlag) {
+        this.liveFlag = liveFlag;
+    }
+
     public String getMemo() {
         return memo;
     }
@@ -291,20 +294,4 @@ public class Teacher implements Serializable {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-
-    public Integer getLiveFlag() {
-        return liveFlag;
-    }
-
-    public void setLiveFlag(Integer liveFlag) {
-        this.liveFlag = liveFlag;
-    }
-
-    public String getTeacherType() {
-        return teacherType;
-    }
-
-    public void setTeacherType(String teacherType) {
-        this.teacherType = teacherType;
-    }
 }

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

@@ -6,6 +6,7 @@ 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.AuthStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -82,7 +83,7 @@ public class TeacherAuthEntryRecord implements Serializable {
     */
     @ApiModelProperty("老师认证审核状态  1、审核中 2、通过 3、不通过 ")
 	@TableField(value = "teacher_auth_status_")
-    private Integer teacherAuthStatus;
+    private AuthStatusEnum teacherAuthStatus;
     /** 
     * 审核人 
     */
@@ -178,11 +179,11 @@ public class TeacherAuthEntryRecord implements Serializable {
         this.teacherCertificate = teacherCertificate;
     }
 
-    public Integer getTeacherAuthStatus() {
+    public AuthStatusEnum getTeacherAuthStatus() {
         return teacherAuthStatus;
     }
 
-    public void setTeacherAuthStatus(Integer teacherAuthStatus) {
+    public void setTeacherAuthStatus(AuthStatusEnum teacherAuthStatus) {
         this.teacherAuthStatus = teacherAuthStatus;
     }
 

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

@@ -4,6 +4,7 @@ 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.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -36,7 +37,7 @@ public class TeacherAuthMusicianRecord implements Serializable {
     */
     @ApiModelProperty("老师认证审核状态  1、审核中 2、通过 3、不通过 ")
 	@TableField(value = "teacher_auth_status_")
-    private Integer teacherAuthStatus;
+    private AuthStatusEnum teacherAuthStatus;
     /** 
     * 审核人 
     */
@@ -74,11 +75,11 @@ public class TeacherAuthMusicianRecord implements Serializable {
         this.userId = userId;
     }
 
-    public Integer getTeacherAuthStatus() {
+    public AuthStatusEnum getTeacherAuthStatus() {
         return teacherAuthStatus;
     }
 
-    public void setTeacherAuthStatus(Integer teacherAuthStatus) {
+    public void setTeacherAuthStatus(AuthStatusEnum teacherAuthStatus) {
         this.teacherAuthStatus = teacherAuthStatus;
     }
 

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

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.enums;
 
+import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.yonge.cooleshow.common.enums.BaseEnum;
 
 /**
@@ -12,7 +13,7 @@ public enum AuthStatusEnum implements BaseEnum<Integer, AuthStatusEnum> {
     DOING(1, "审核中"),
     PASS(2, "通过"),
     UNPASS(3, "不通过");
-
+    @EnumValue
     private Integer code;
 
     private String msg;

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

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.enums;
 
+import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.yonge.cooleshow.common.enums.BaseEnum;
 
 /***
@@ -7,12 +8,15 @@ import com.yonge.cooleshow.common.enums.BaseEnum;
  * @author liweifan
  * @updateTime 2022/3/23 17:01
  */
+
 public enum TeacherTypeEnum implements BaseEnum<String, TeacherTypeEnum> {
     TOURIST("游客"), ENTRY("认证老师"), MUSICIAN("平台音乐人");
-
+    @EnumValue
+    private String code;
     private String msg;
 
     TeacherTypeEnum(String msg) {
+        this.code = this.name();
         this.msg = msg;
     }
 
@@ -24,4 +28,5 @@ public enum TeacherTypeEnum implements BaseEnum<String, TeacherTypeEnum> {
     public String getMsg() {
         return msg;
     }
+
 }

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

@@ -1,11 +1,12 @@
 package com.yonge.cooleshow.biz.dal.enums;
 
+import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.yonge.cooleshow.common.enums.BaseEnum;
 
 public enum YesOrNoEnum implements BaseEnum<Integer, YesOrNoEnum> {
     NO(0,"否"),
     YES(1,"是");
-
+    @EnumValue
     private Integer code;
     private String msg;
 

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

@@ -48,6 +48,13 @@ public interface TeacherAuthEntryRecordService extends IService<TeacherAuthEntry
      * @return: java.lang.Boolean
      */
     HttpResponseResult<Boolean> doApply(TeacherApplyDetailReq teacherApplyDetailDto, SysUser sysUser) throws Exception;
-
+    /***
+     * 获取最后一条申请记录
+     * @author liweifan
+     * @param: userId
+     * @updateTime 2022/3/25 15:56
+     * @return: com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord
+     */
+    TeacherAuthEntryRecordVo getLastRecordByUserId(Long userId);
 
 }

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

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.req.AuthOperaReq;
 import com.yonge.cooleshow.biz.dal.dto.search.AuthEntryRecordSearch;
+import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
 import com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.vo.MusicianAuthEntryRecordVo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 
@@ -38,7 +40,16 @@ public interface TeacherAuthMusicianRecordService extends IService<TeacherAuthMu
      * @updateTime 2022/3/21 19:27
      * @return: java.lang.Integer
      */
-    Integer getMusicianAuthStatus(Long id);
+    AuthStatusEnum getMusicianAuthStatus(Long id);
+    /***
+     * 审核
+     * @author liweifan
+     * @param: authOperaReq
+     * @param: sysUser
+     * @updateTime 2022/3/22 20:06
+     * @return: com.yonge.cooleshow.common.entity.HttpResponseResult<java.lang.Boolean>
+     */
+    HttpResponseResult<Boolean> doAuth(AuthOperaReq authOperaReq, SysUser sysUser);
     /***
      * 提交音乐人审批申请
      * @author liweifan
@@ -47,14 +58,13 @@ public interface TeacherAuthMusicianRecordService extends IService<TeacherAuthMu
      * @return: com.yonge.cooleshow.common.entity.HttpResponseResult<java.lang.Boolean>
      */
     HttpResponseResult<Boolean> doApply(Long id);
-
     /***
-     * 审核
+     * 获取最后一条申请记录
      * @author liweifan
-     * @param: authOperaReq
-     * @param: sysUser
-     * @updateTime 2022/3/22 20:06
-     * @return: com.yonge.cooleshow.common.entity.HttpResponseResult<java.lang.Boolean>
+     * @param: userId
+     * @updateTime 2022/3/25 15:56
+     * @return: com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord
      */
-    HttpResponseResult<Boolean> doAuth(AuthOperaReq authOperaReq, SysUser sysUser);
+    TeacherAuthMusicianRecord getLastRecordByUserId(Long userId);
+
 }

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

@@ -10,6 +10,7 @@ import com.yonge.cooleshow.biz.dal.dto.req.TeacherApplyDetailReq;
 import com.yonge.cooleshow.biz.dal.dto.search.AuthEntryRecordSearch;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import org.apache.commons.beanutils.BeanUtils;
@@ -43,13 +44,13 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
     @Transactional(rollbackFor = Exception.class)
     public HttpResponseResult<Boolean> doAuth(AuthOperaReq authOperaReq, SysUser sysUser) {
         TeacherAuthEntryRecord build = baseMapper.selectById(authOperaReq.getId());
-        build.setTeacherAuthStatus(authOperaReq.getPass() ? AuthStatusEnum.PASS.getCode() : AuthStatusEnum.UNPASS.getCode());
+        build.setTeacherAuthStatus(authOperaReq.getPass() ? AuthStatusEnum.PASS : AuthStatusEnum.UNPASS);
         build.setReason(authOperaReq.getReason());
 
         //修改teacher表
         Teacher teacher = new Teacher();
         teacher.setUserId(build.getUserId());
-        teacher.setEntryStatus(build.getTeacherAuthStatus());
+        teacher.setEntryFlag(authOperaReq.getPass() ? YesOrNoEnum.YES : YesOrNoEnum.NO);
         teacher.setEntryAuthDate(new Date());
         teacherDao.updateById(teacher);
 
@@ -64,20 +65,21 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
         if (hasApply(sysUser.getId())) {
             return HttpResponseResult.failed("已经提交过申请");
         }
+        //todo 判断用户是否已经通过申请
         //修改用户表
         baseMapper.updateUserCard(teacherApplyDetailDto);
         //新增申请记录
         TeacherAuthEntryRecord teacherAuthEntryRecord = new TeacherAuthEntryRecord();
         BeanUtils.copyProperties(teacherAuthEntryRecord, teacherApplyDetailDto);
 
-        Teacher teacher = new Teacher();
-        teacher.setUserId(sysUser.getId());
-        teacher.setEntryStatus(AuthStatusEnum.DOING.getCode());
-        teacherDao.updateById(teacher);
-
         return HttpResponseResult.status(baseMapper.insert(teacherAuthEntryRecord) > 0);
     }
 
+    @Override
+    public TeacherAuthEntryRecordVo getLastRecordByUserId(Long userId) {
+        return baseMapper.getLastRecordByUserId(userId);
+    }
+
     /***
      * 判断用户是否已经提交申请
      * @author liweifan

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

@@ -8,10 +8,8 @@ import com.yonge.cooleshow.biz.dal.dao.TeacherDao;
 import com.yonge.cooleshow.biz.dal.dto.req.AuthOperaReq;
 import com.yonge.cooleshow.biz.dal.dto.search.AuthEntryRecordSearch;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
-import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
-import com.yonge.cooleshow.biz.dal.service.TeacherService;
-import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.vo.MusicianAuthEntryRecordVo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,8 +25,6 @@ import java.util.Date;
 @Service
 public class TeacherAuthMusicianRecordServiceImpl extends ServiceImpl<TeacherAuthMusicianRecordDao, TeacherAuthMusicianRecord> implements TeacherAuthMusicianRecordService {
     @Autowired
-    private TeacherService teacherService;
-    @Autowired
     private TeacherDao teacherDao;
 
     @Override
@@ -42,9 +38,9 @@ public class TeacherAuthMusicianRecordServiceImpl extends ServiceImpl<TeacherAut
     }
 
     @Override
-    public Integer getMusicianAuthStatus(Long id) {
-        Teacher teacher = teacherService.getById(id);
-        return null == teacher ? 0 : teacher.getMusicianAuthStatus();
+    public AuthStatusEnum getMusicianAuthStatus(Long id) {
+        TeacherAuthMusicianRecord lastRecordByUserId = getLastRecordByUserId(id);
+        return null == lastRecordByUserId ? null : lastRecordByUserId.getTeacherAuthStatus();
     }
 
     @Override
@@ -54,30 +50,30 @@ public class TeacherAuthMusicianRecordServiceImpl extends ServiceImpl<TeacherAut
         if (hasApply(id)) {
             return HttpResponseResult.failed("已经提交过申请");
         }
+        //todo 判断用户是否已经通过申请
 
         TeacherAuthMusicianRecord record = new TeacherAuthMusicianRecord();
         record.setUserId(id);
-        record.setTeacherAuthStatus(AuthStatusEnum.DOING.getCode());
-
-        Teacher teacher = new Teacher();
-        teacher.setUserId(id);
-        teacher.setMusicianAuthStatus(AuthStatusEnum.DOING.getCode());
-        teacherDao.updateById(teacher);
-
+        record.setTeacherAuthStatus(AuthStatusEnum.DOING);
         return HttpResponseResult.status(baseMapper.insert(record) > 0);
     }
 
     @Override
+    public TeacherAuthMusicianRecord getLastRecordByUserId(Long userId) {
+        return baseMapper.getLastRecordByUserId(userId);
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public HttpResponseResult<Boolean> doAuth(AuthOperaReq authOperaReq, SysUser sysUser) {
         TeacherAuthMusicianRecord build = baseMapper.selectById(authOperaReq.getId());
-        build.setTeacherAuthStatus(authOperaReq.getPass() ? AuthStatusEnum.PASS.getCode() : AuthStatusEnum.UNPASS.getCode());
+        build.setTeacherAuthStatus(authOperaReq.getPass() ? AuthStatusEnum.PASS : AuthStatusEnum.UNPASS);
         build.setReason(authOperaReq.getReason());
 
         //修改teacher表
         Teacher teacher = new Teacher();
         teacher.setUserId(build.getUserId());
-        teacher.setMusicianAuthStatus(build.getTeacherAuthStatus());
+        teacher.setMusicianFlag(authOperaReq.getPass() ? YesOrNoEnum.YES : YesOrNoEnum.NO);
         teacher.setMusicianDate(new Date());
         teacherDao.updateById(teacher);
 

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

@@ -11,11 +11,15 @@ import com.yonge.cooleshow.biz.dal.dto.req.UserSetReq;
 import com.yonge.cooleshow.biz.dal.dto.req.TeacherSubmitReq;
 import com.yonge.cooleshow.biz.dal.dto.search.TeacherSearch;
 import com.yonge.cooleshow.biz.dal.entity.Subject;
+import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
 import com.yonge.cooleshow.biz.dal.entity.TeacherStyleVideo;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.TeacherTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.EmployeeService;
+import com.yonge.cooleshow.biz.dal.service.TeacherAuthEntryRecordService;
 import com.yonge.cooleshow.biz.dal.service.TeacherStyleVideoService;
+import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 import com.yonge.cooleshow.biz.dal.vo.UserSetVo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -41,6 +45,9 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
     private EmployeeDao employeeDao;
     @Autowired
     private SysUserFeignService userFeignService;
+    @Autowired
+    private TeacherAuthEntryRecordService entryRecordService;
+
 
     @Override
     public TeacherVo detail(Long userId) {
@@ -50,6 +57,8 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         }
         List<TeacherStyleVideo> teacherStyleVideos = teacherStyleVideoService.selectListByUserId(userId);
         detail.setStyleVideo(teacherStyleVideos);
+        TeacherAuthEntryRecordVo lastRecordByUserId = entryRecordService.getLastRecordByUserId(userId);
+        detail.setVerifyUser(lastRecordByUserId.getVerifyUser());
         return detail;
     }
 
@@ -76,7 +85,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         if (true) {
             Teacher teacher = new Teacher();
             teacher.setUserId(id);
-            teacher.setLiveFlag(1);
+            teacher.setLiveFlag(YesOrNoEnum.YES);
             baseMapper.updateById(teacher);
         }
         return HttpResponseResult.status(true);
@@ -170,16 +179,19 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
      */
     private Teacher getTeacherDetil(Teacher teacher, TeacherSubmitReq teacherSubmitReq) {
         teacher.setSubjectId(teacherSubmitReq.getSubjectId());
-        teacher.setTeacherType(teacherSubmitReq.getTeacherType());
 
         String[] teacherTypes = teacherSubmitReq.getTeacherType().split(",");
+        teacher.setEntryFlag(YesOrNoEnum.NO);
+        teacher.setEntryAuthDate(null);
+        teacher.setMusicianFlag(YesOrNoEnum.NO);
+        teacher.setMusicianDate(null);
         for (String teacherType : teacherTypes) {
             if (TeacherTypeEnum.ENTRY.getCode().equals(teacherType)) {
-                teacher.setEntryStatus(AuthStatusEnum.PASS.getCode());
+                teacher.setEntryFlag(YesOrNoEnum.YES);
                 teacher.setEntryAuthDate(new Date());
             }
             if (TeacherTypeEnum.MUSICIAN.getCode().equals(teacherType)) {
-                teacher.setMusicianAuthStatus(AuthStatusEnum.PASS.getCode());
+                teacher.setMusicianFlag(YesOrNoEnum.YES);
                 teacher.setMusicianDate(new Date());
             }
         }

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

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.entity.Student;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -23,9 +24,9 @@ public class StudentVo extends Student {
     @ApiModelProperty(value = "手机号")
     private String phone;
     @ApiModelProperty(value = "是否实名 0否 1是")
-    private Boolean isReal;
+    private YesOrNoEnum isReal;
     @ApiModelProperty(value = "是否会员 0否 1是")
-    private Boolean isBank;
+    private YesOrNoEnum isBank;
     @ApiModelProperty(value = "真实姓名")
     private String realName;
     @ApiModelProperty(value = "身份证号码")
@@ -37,7 +38,7 @@ public class StudentVo extends Student {
     @ApiModelProperty(value = "年龄")
     private Integer age;
     @ApiModelProperty(value = "是否会员 0否 1是")
-    private Boolean isVip;
+    private YesOrNoEnum isVip;
 
     public String getAvatar() {
         return avatar;
@@ -71,22 +72,6 @@ public class StudentVo extends Student {
         this.phone = phone;
     }
 
-    public Boolean getReal() {
-        return isReal;
-    }
-
-    public void setReal(Boolean real) {
-        isReal = real;
-    }
-
-    public Boolean getBank() {
-        return isBank;
-    }
-
-    public void setBank(Boolean bank) {
-        isBank = bank;
-    }
-
     public String getRealName() {
         return realName;
     }
@@ -119,11 +104,27 @@ public class StudentVo extends Student {
         this.age = age;
     }
 
-    public Boolean getVip() {
+    public YesOrNoEnum getIsReal() {
+        return isReal;
+    }
+
+    public void setIsReal(YesOrNoEnum isReal) {
+        this.isReal = isReal;
+    }
+
+    public YesOrNoEnum getIsBank() {
+        return isBank;
+    }
+
+    public void setIsBank(YesOrNoEnum isBank) {
+        this.isBank = isBank;
+    }
+
+    public YesOrNoEnum getIsVip() {
         return isVip;
     }
 
-    public void setVip(Boolean vip) {
-        isVip = vip;
+    public void setIsVip(YesOrNoEnum isVip) {
+        this.isVip = isVip;
     }
 }

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

@@ -3,6 +3,8 @@ package com.yonge.cooleshow.biz.dal.vo;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -30,11 +32,11 @@ public class TeacherHomeVo {
     @ApiModelProperty("未上课时")
     private Integer unExpTime;
     @ApiModelProperty("老师入驻状态  1、审核中 2、通过 3、不通过 ")
-    private Integer entryStatus;
+    private AuthStatusEnum entryStatus;
     @ApiModelProperty("音乐人审核状态  1、审核中 2、通过 3、不通过 ")
-    private Integer musicianAuthStatus;
+    private AuthStatusEnum musicianAuthStatus;
     @ApiModelProperty("是否有直播权限 0 否 1 是")
-    private Integer liveFlag;
+    private YesOrNoEnum liveFlag;
 
     public Long getUserId() {
         return userId;
@@ -92,27 +94,27 @@ public class TeacherHomeVo {
         this.unExpTime = unExpTime;
     }
 
-    public Integer getEntryStatus() {
+    public AuthStatusEnum getEntryStatus() {
         return entryStatus;
     }
 
-    public void setEntryStatus(Integer entryStatus) {
+    public void setEntryStatus(AuthStatusEnum entryStatus) {
         this.entryStatus = entryStatus;
     }
 
-    public Integer getMusicianAuthStatus() {
+    public AuthStatusEnum getMusicianAuthStatus() {
         return musicianAuthStatus;
     }
 
-    public void setMusicianAuthStatus(Integer musicianAuthStatus) {
+    public void setMusicianAuthStatus(AuthStatusEnum musicianAuthStatus) {
         this.musicianAuthStatus = musicianAuthStatus;
     }
 
-    public Integer getLiveFlag() {
+    public YesOrNoEnum getLiveFlag() {
         return liveFlag;
     }
 
-    public void setLiveFlag(Integer liveFlag) {
+    public void setLiveFlag(YesOrNoEnum liveFlag) {
         this.liveFlag = liveFlag;
     }
 }

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

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.biz.dal.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.entity.TeacherStyleVideo;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -25,9 +26,9 @@ public class TeacherVo extends Teacher {
     @ApiModelProperty(value = "手机号")
     private String phone;
     @ApiModelProperty(value = "是否实名 0否 1是")
-    private Boolean isReal;
+    private YesOrNoEnum isReal;
     @ApiModelProperty(value = "是否绑卡 0否 1是")
-    private Boolean isBank;
+    private YesOrNoEnum isBank;
     @ApiModelProperty(value = "真实姓名")
     private String realName;
     @ApiModelProperty(value = "身份证号码")
@@ -73,20 +74,20 @@ public class TeacherVo extends Teacher {
         this.phone = phone;
     }
 
-    public Boolean getReal() {
+    public YesOrNoEnum getIsReal() {
         return isReal;
     }
 
-    public void setReal(Boolean real) {
-        isReal = real;
+    public void setIsReal(YesOrNoEnum isReal) {
+        this.isReal = isReal;
     }
 
-    public Boolean getBank() {
+    public YesOrNoEnum getIsBank() {
         return isBank;
     }
 
-    public void setBank(Boolean bank) {
-        isBank = bank;
+    public void setIsBank(YesOrNoEnum isBank) {
+        this.isBank = isBank;
     }
 
     public String getRealName() {

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

@@ -1,13 +1,9 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yonge.cooleshow.biz.dal.entity.TeacherStyleVideo;
+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.util.Date;
-import java.util.List;
 
 /**
  *
@@ -25,7 +21,7 @@ public class UserSetVo {
     @ApiModelProperty(value = "手机号")
     private String phone;
     @ApiModelProperty(value = "是否实名 0否 1是")
-    private Boolean isReal;
+    private YesOrNoEnum isReal;
 
     public String getAvatar() {
         return avatar;
@@ -59,11 +55,11 @@ public class UserSetVo {
         this.phone = phone;
     }
 
-    public Boolean getReal() {
+    public YesOrNoEnum getIsReal() {
         return isReal;
     }
 
-    public void setReal(Boolean real) {
-        isReal = real;
+    public void setIsReal(YesOrNoEnum isReal) {
+        this.isReal = isReal;
     }
 }

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

@@ -62,7 +62,7 @@
             u.real_name_ as realName,
             u.id_card_no_ as idCardNo,
             u.phone_ as phone,
-            u.gender as gender
+            u.gender_ as gender
         FROM teacher_auth_entry_record t
         left join sys_user u on t.user_id_ = u.id_
         left join sys_user v on t.verify_user_id_ = u.id_
@@ -105,4 +105,21 @@
         left join sys_user u on t.user_id_ = u.id_
         where t.id_ = #{id}
     </select>
+    <select id="getLastRecordByUserId" resultType="com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo">
+        select
+            <include refid="baseColumns"/>,
+            u.real_name_ as realName,
+            u.id_card_no_ as idCardNo,
+            u.gender_ as gender,
+            (
+                SELECT GROUP_CONCAT(name_) FROM subject WHERE FIND_IN_SET(id_,t.subject_id_)
+            ) as subjectName,
+            (
+                SELECT u.username_ FROM sys_user u WHERE u.id_ = t.verify_user_id_
+            ) as verifyUser
+        from teacher_auth_entry_record t
+        left join sys_user u on t.verify_user_id_ = u.id_
+        where t.user_id_ = #{userId}
+		order by t.create_time_ desc limit 1
+    </select>
 </mapper>

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

@@ -67,4 +67,9 @@
 			</if>
 		</where>
 	</select>
+    <select id="getLastRecordByUserId"
+            resultType="com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord">
+		select * from teacher_auth_musician_record where user_id_ = #{userId}
+		order by create_time_ desc limit 1
+	</select>
 </mapper>

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

@@ -2,25 +2,25 @@
 <!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.TeacherDao">
     <resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.Teacher">
-        <result column="user_id_" property="userId"/>
-        <result column="education_background_" property="educationBackground"/>
-        <result column="graduate_school_" property="graduateSchool"/>
-        <result column="technical_titles_" property="technicalTitles"/>
-        <result column="work_unit_" property="workUnit"/>
-        <result column="subject_id_" property="subjectId"/>
-        <result column="teacher_type_" property="teacherType"/>
-        <result column="entry_status_" property="entryStatus"/>
-        <result column="entry_auth_date_" property="entryAuthDate"/>
-        <result column="introduction_" property="introduction"/>
-        <result column="musician_auth_status_" property="musicianAuthStatus"/>
-        <result column="musician_date_" property="musicianDate"/>
-        <result column="subject_" property="subject"/>
-        <result column="grad_certificate_" property="gradCertificate"/>
-        <result column="degree__certificate_" property="degreeCertificate"/>
-        <result column="teacher__certificate_" property="teacherCertificate"/>
-        <result column="memo_" property="memo"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="update_time_" property="updateTime"/>
+        <result column="user_id_" property="userId" />
+        <result column="education_background_" property="educationBackground" />
+        <result column="graduate_school_" property="graduateSchool" />
+        <result column="technical_titles_" property="technicalTitles" />
+        <result column="work_unit_" property="workUnit" />
+        <result column="subject_id_" property="subjectId" />
+        <result column="introduction_" property="introduction" />
+        <result column="subject_" property="subject" />
+        <result column="grad_certificate_" property="gradCertificate" />
+        <result column="degree__certificate_" property="degreeCertificate" />
+        <result column="teacher__certificate_" property="teacherCertificate" />
+        <result column="entry_flag_" property="entryFlag" />
+        <result column="entry_auth_date_" property="entryAuthDate" />
+        <result column="musician_flag_" property="musicianFlag" />
+        <result column="musician_date_" property="musicianDate" />
+        <result column="live_flag_" property="liveFlag" />
+        <result column="memo_" property="memo" />
+        <result column="create_time_" property="createTime" />
+        <result column="update_time_" property="updateTime" />
     </resultMap>
 
     <!-- 表字段 -->
@@ -31,23 +31,23 @@
         , t.technical_titles_ as "technicalTitles"
         , t.work_unit_ as "workUnit"
         , t.subject_id_ as "subjectId"
-		, t.teacher_type_ as "teacherType"
-		, t.entry_status_ as "entryStatus"
-        , t.entry_auth_date_ as "entryAuthDate"
         , t.introduction_ as "introduction"
-        , t.musician_auth_status_ as "musicianAuthStatus"
-        , t.musician_date_ as "musicianDate"
         , t.subject_ as "subject"
         , t.grad_certificate_ as "gradCertificate"
         , t.degree__certificate_ as "degreeCertificate"
         , t.teacher__certificate_ as "teacherCertificate"
+        , t.entry_flag_ as "entryFlag"
+        , t.entry_auth_date_ as "entryAuthDate"
+        , t.musician_flag_ as "musicianFlag"
+        , t.musician_date_ as "musicianDate"
+        , t.live_flag_ as "liveFlag"
         , t.memo_ as "memo"
         , t.create_time_ as "createTime"
         , t.update_time_ as "updateTime"
         </sql>
 
     <!-- 分页查询 -->
-    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.TeacherVo">
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.TeacherVo" >
         SELECT
             <include refid="baseColumns"/>,
             u.username_ as username,
@@ -101,9 +101,6 @@
             (case when isnull(u.id_card_no_) then 0 else 1 end) as isReal,
             u.real_name_ as realName,
             id_card_no_ as idCardNo,
-            (
-                SELECT u.username_ FROM sys_user u WHERE u.id_ = t.verify_user_id_
-            ) as verifyUser,
             (case when isnull(b.user_id_) then 0 else 1 end) as isBank
         FROM teacher t
         left join sys_user u on t.user_id_ = u.id_

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

@@ -21,7 +21,7 @@ import com.yonge.cooleshow.biz.dal.entity.StudentAttendance;
 import com.yonge.cooleshow.biz.dal.service.StudentAttendanceService;
 
 @RestController
-@RequestMapping("/StudentAttendance")
+@RequestMapping("/studentAttendance")
 @Api(value = "学生考勤表", tags = "学生考勤表")
 public class StudentAttendanceController extends BaseController {
 

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

@@ -33,7 +33,7 @@ import com.yonge.cooleshow.biz.dal.entity.Student;
 import com.yonge.cooleshow.biz.dal.service.StudentService;
 
 @RestController
-@RequestMapping("/Student")
+@RequestMapping("/student")
 @Api(value = "学生表", tags = "学生表")
 public class StudentController extends BaseController {
     @Autowired

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

@@ -21,7 +21,7 @@ import com.yonge.cooleshow.biz.dal.entity.StudentCourseHomework;
 import com.yonge.cooleshow.biz.dal.service.StudentCourseHomeworkService;
 
 @RestController
-@RequestMapping("/StudentCourseHomework")
+@RequestMapping("/studentCourseHomework")
 @Api(value = "学生课程作业", tags = "学生课程作业")
 public class StudentCourseHomeworkController extends BaseController {
 

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

@@ -21,7 +21,7 @@ import com.yonge.cooleshow.biz.dal.entity.StudentStar;
 import com.yonge.cooleshow.biz.dal.service.StudentStarService;
 
 @RestController
-@RequestMapping("/StudentStar")
+@RequestMapping("/studentStar")
 @Api(value = "学生关注教师表", tags = "学生关注教师表")
 public class StudentStarController extends BaseController {
 

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

@@ -21,7 +21,7 @@ import com.yonge.cooleshow.biz.dal.entity.VipCardRecord;
 import com.yonge.cooleshow.biz.dal.service.VipCardRecordService;
 
 @RestController
-@RequestMapping("/VipCardRecord")
+@RequestMapping("/vipCardRecord")
 @Api(value = "购买会员卡记录表", tags = "购买会员卡记录表")
 public class VipCardRecordController extends BaseController {
 

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

@@ -20,7 +20,7 @@ import com.yonge.cooleshow.biz.dal.entity.Order;
 import com.yonge.cooleshow.biz.dal.service.OrderService;
 
 @RestController
-@RequestMapping("/Order")
+@RequestMapping("/order")
 @Api(value = "平台订单表", tags = "平台订单表")
 public class OrderController extends BaseController {
 

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

@@ -20,7 +20,7 @@ import com.yonge.cooleshow.biz.dal.entity.OrderDetail;
 import com.yonge.cooleshow.biz.dal.service.OrderDetailService;
 
 @RestController
-@RequestMapping("/OrderDetail")
+@RequestMapping("/orderDetail")
 @Api(value = "平台订单表", tags = "平台订单表")
 public class OrderDetailController extends BaseController {
 

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

@@ -20,7 +20,7 @@ import com.yonge.cooleshow.biz.dal.entity.OrderRefunds;
 import com.yonge.cooleshow.biz.dal.service.OrderRefundsService;
 
 @RestController
-@RequestMapping("/OrderRefunds")
+@RequestMapping("/orderRefunds")
 @Api(value = "用户退款表", tags = "用户退款表")
 public class OrderRefundsController extends BaseController {
 

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

@@ -16,7 +16,7 @@ import com.yonge.cooleshow.biz.dal.service.TeacherAuthEntryRecordService;
 import javax.validation.Valid;
 
 @RestController
-@RequestMapping("/TeacherAuthEntryRecord")
+@RequestMapping("/teacherAuthEntryRecord")
 @Api(value = "老师入驻审核表", tags = "老师入驻审核表")
 public class TeacherAuthEntryRecordController extends BaseController {
     @Autowired

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

@@ -1,58 +1,49 @@
 package com.yonge.cooleshow.teacher.controller;
 
-import java.util.List;
-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.support.Condition;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
-
-import com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord;
 import com.yonge.cooleshow.biz.dal.service.TeacherAuthMusicianRecordService;
 
 @RestController
-@RequestMapping("/TeacherAuthMusicianRecord")
+@RequestMapping("/teacherAuthMusicianRecord")
 @Api(value = "老师音乐人审核表", tags = "老师音乐人审核表")
 public class TeacherAuthMusicianRecordController extends BaseController {
 
     @Autowired
     private TeacherAuthMusicianRecordService teacherAuthMusicianRecordService;
-	@Autowired
-	private SysUserFeignService sysUserFeignService;
-
-	/**
-	 * 获取音乐人审核状态
-	 */
-	@GetMapping("/getMusicianAuthStatus")
-	@ApiOperation(value = "获取音乐人审核状态")
-	public HttpResponseResult<Integer> getMusicianAuthStatus() {
-		SysUser user = sysUserFeignService.queryUserInfo();
-		if (user == null) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
-		Integer musicianAuthStatus = teacherAuthMusicianRecordService.getMusicianAuthStatus(user.getId());
-
-		return succeed(musicianAuthStatus);
-	}
-
-	@PostMapping("/doApply")
-	@ApiOperation(value = "提交申请", notes = "传入teacherAuthEntryRecord")
-	public HttpResponseResult<Boolean> doApply(){
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		//处理老师申请逻辑
-		return teacherAuthMusicianRecordService.doApply(sysUser.getId());
-	}
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    /**
+     * 获取音乐人审核状态
+     */
+    @GetMapping("/getMusicianAuthStatus")
+    @ApiOperation(value = "获取音乐人审核状态")
+    public HttpResponseResult<AuthStatusEnum> getMusicianAuthStatus() {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        AuthStatusEnum musicianAuthStatus = teacherAuthMusicianRecordService.getMusicianAuthStatus(user.getId());
+        return succeed(musicianAuthStatus);
+    }
+
+    @PostMapping("/doApply")
+    @ApiOperation(value = "提交申请", notes = "传入teacherAuthEntryRecord")
+    public HttpResponseResult<Boolean> doApply() {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        //处理老师申请逻辑
+        return teacherAuthMusicianRecordService.doApply(sysUser.getId());
+    }
 
 }

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

@@ -4,8 +4,13 @@ import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
+import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
+import com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord;
+import com.yonge.cooleshow.biz.dal.service.TeacherAuthEntryRecordService;
+import com.yonge.cooleshow.biz.dal.service.TeacherAuthMusicianRecordService;
 import com.yonge.cooleshow.biz.dal.service.TeacherService;
 import com.yonge.cooleshow.biz.dal.vo.TeacherHomeVo;
+import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
@@ -20,13 +25,15 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 
 @RestController
-@RequestMapping("/Teacher")
+@RequestMapping("/teacher")
 @Api(value = "教师表", tags = "教师表")
 public class TeacherController extends BaseController {
-
     @Autowired
     private TeacherService teacherService;
-
+    @Autowired
+    private TeacherAuthEntryRecordService entryRecordService;
+    @Autowired
+    private TeacherAuthMusicianRecordService musicianRecordService;
     @Autowired
     private SysUserFeignService sysUserFeignService;
 
@@ -43,8 +50,11 @@ public class TeacherController extends BaseController {
 		teacherHomeVo.setHeardUrl(user.getAvatar());
 		teacherHomeVo.setUsername(user.getUsername());
 
-        teacherHomeVo.setEntryStatus(teacher.getEntryStatus());
-        teacherHomeVo.setMusicianAuthStatus(teacher.getMusicianAuthStatus());
+        TeacherAuthEntryRecord entryRecord = entryRecordService.getLastRecordByUserId(user.getId());
+        teacherHomeVo.setEntryStatus(entryRecord.getTeacherAuthStatus());
+
+        TeacherAuthMusicianRecord musicianRecord = musicianRecordService.getLastRecordByUserId(user.getId());
+        teacherHomeVo.setMusicianAuthStatus(musicianRecord.getTeacherAuthStatus());
         teacherHomeVo.setLiveFlag(teacher.getLiveFlag());
 
 		//todo 老师授课信息

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

@@ -20,7 +20,7 @@ import com.yonge.cooleshow.biz.dal.entity.TeacherWithdrawal;
 import com.yonge.cooleshow.biz.dal.service.TeacherWithdrawalService;
 
 @RestController
-@RequestMapping("/TeacherWithdrawal")
+@RequestMapping("/teacherWithdrawal")
 @Api(value = "老师账户提现表", tags = "老师账户提现表")
 public class TeacherWithdrawalController extends BaseController {
 

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

@@ -20,7 +20,7 @@ import com.yonge.cooleshow.biz.dal.entity.UserAccount;
 import com.yonge.cooleshow.biz.dal.service.UserAccountService;
 
 @RestController
-@RequestMapping("/UserAccount")
+@RequestMapping("/userAccount")
 @Api(value = "老师账户表", tags = "老师账户表")
 public class UserAccountController extends BaseController {
 

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

@@ -20,7 +20,7 @@ import com.yonge.cooleshow.biz.dal.entity.UserAccountRecord;
 import com.yonge.cooleshow.biz.dal.service.UserAccountRecordService;
 
 @RestController
-@RequestMapping("/UserAccountRecord")
+@RequestMapping("/userAccountRecord")
 @Api(value = "老师账户流水表", tags = "老师账户流水表")
 public class UserAccountRecordController extends BaseController {
 

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

@@ -20,7 +20,7 @@ import com.yonge.cooleshow.biz.dal.entity.UserBankCard;
 import com.yonge.cooleshow.biz.dal.service.UserBankCardService;
 
 @RestController
-@RequestMapping("/UserBankCard")
+@RequestMapping("/userBankCard")
 @Api(value = "老师绑卡记录表", tags = "老师绑卡记录表")
 public class UserBankCardController extends BaseController {
 

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

@@ -20,7 +20,7 @@ import com.yonge.cooleshow.biz.dal.entity.VipCard;
 import com.yonge.cooleshow.biz.dal.service.VipCardService;
 
 @RestController
-@RequestMapping("/VipCard")
+@RequestMapping("/vipCard")
 @Api(value = "会员卡表", tags = "会员卡表")
 public class VipCardController extends BaseController {