update: 统一审批状态

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())){

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,7 @@
 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;

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

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.StateEnum;
 import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.toolset.utils.string.StringUtil;
@@ -38,7 +38,7 @@ public class MusicSheetSearch  extends QueryInfo{
     private StateEnum state;
 
     @ApiModelProperty("曲目审核状态(0:待审核;1:通过;2:未通过)")
-    private AuditEnum auditStatus;
+    private AuthStatusEnum auditStatus;
 
     @ApiModelProperty(value = "创建人id （老师id）")
     private Long createBy;
@@ -100,11 +100,11 @@ public class MusicSheetSearch  extends QueryInfo{
         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/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/entity/MusicSheet.java

@@ -80,8 +80,8 @@ public class MusicSheet implements Serializable {
 	private StateEnum state;
 
     @TableField("audit_status_")
-    @ApiModelProperty(value = "审核状态(0:待审核;1:通过;2:未通过)")
-    private AuditEnum auditStatus;  //审核状态(0:待审核;1:通过;2:未通过)
+    @ApiModelProperty(value = "审核状态(1:待审核;2:通过;3:未通过)")
+    private AuthStatusEnum auditStatus;
 
     @TableField("sort_number_")
     @ApiModelProperty(value = "排序号")
@@ -234,11 +234,11 @@ public class MusicSheet implements Serializable {
 		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;
 
@@ -28,7 +28,7 @@ public class MusicSheetAuthRecord implements Serializable {
     private Long musicSheetId;
     @ApiModelProperty("审核状态 0:审核中;1:通过;2:未通过 ")
 	@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/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.*;
@@ -118,7 +115,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
         MusicSheetSearch query = new MusicSheetSearch();
         // 设置只查老师用户
         query.setCreateBy(sysUser.getId());
-        query.setAuditStatus(AuditEnum.OPEN);
+        query.setAuditStatus(AuthStatusEnum.PASS);
         query.setState(StateEnum.ENABLE);
         // 只查3条
         query.setRows(3);
@@ -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/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-student/src/main/java/com/yonge/cooleshow/student/controller/MusicSheetController.java

@@ -6,6 +6,7 @@ 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.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.StateEnum;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
@@ -61,7 +62,7 @@ public class MusicSheetController extends BaseController {
 
         // 学生 只能看通过审核 并且 启用的 曲目
         query.setState(StateEnum.ENABLE);
-        query.setAuditStatus(AuditEnum.OPEN);
+        query.setAuditStatus(AuthStatusEnum.PASS);
         query.setStudentId(sysUser.getId());
         IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectStudentPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(musicSheetVoIPage));
@@ -95,7 +96,7 @@ public class MusicSheetController extends BaseController {
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
         search.setStudentId(sysUser.getId());
         search.setState(StateEnum.ENABLE);
-        search.setAuditStatus(AuditEnum.OPEN);
+        search.setAuditStatus(AuthStatusEnum.PASS);
         IPage<MusicSheetVo> sheetVoIPage = musicSheetService.myMusic(PageUtil.getPage(query),search);
         return succeed(PageUtil.pageInfo(sheetVoIPage));
     }
@@ -114,7 +115,7 @@ public class MusicSheetController extends BaseController {
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
         search.setStudentId(sysUser.getId());
         search.setState(StateEnum.ENABLE);
-        search.setAuditStatus(AuditEnum.OPEN);
+        search.setAuditStatus(AuthStatusEnum.PASS);
         IPage<MusicSheetVo> sheetVoIPage = musicSheetService.favoriteMusic(PageUtil.getPage(query),search);
         return succeed(PageUtil.pageInfo(sheetVoIPage));
     }
@@ -133,7 +134,7 @@ public class MusicSheetController extends BaseController {
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
         search.setStudentId(sysUser.getId());
         search.setState(StateEnum.ENABLE);
-        search.setAuditStatus(AuditEnum.OPEN);
+        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();