Merge branch 'zx_online_cbs' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/MusicSheetAuthRecordController.java

@@ -1,9 +1,14 @@
 package com.yonge.cooleshow.teacher.controller;
 
+import com.yonge.cooleshow.biz.dal.dto.search.TeacherMusicSheetAuditSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheetAuthRecord;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetAuthRecordService;
+import com.yonge.cooleshow.biz.dal.service.SysUserService;
+import com.yonge.cooleshow.biz.dal.vo.TeacherMusicSheetVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
@@ -20,6 +25,15 @@ import javax.annotation.Resource;
 public class MusicSheetAuthRecordController extends BaseController {
     @Resource
     private MusicSheetAuthRecordService musicSheetAuthRecordService;
+    @Resource
+    private SysUserService sysUserService;
+
+    @PostMapping(value = "/list", consumes="application/json", produces="application/json")
+    @ApiOperation(value = "审核中心-乐谱审核列表", httpMethod="POST", consumes="application/json", produces="application/json")
+    public HttpResponseResult<PageInfo<TeacherMusicSheetVo>> audit(@RequestBody TeacherMusicSheetAuditSearch query) {
+        query.setCreateBy(sysUserService.getUserId());
+        return succeed(PageUtil.pageInfo(musicSheetAuthRecordService.selectAuditPage(PageUtil.getPage(query),query)));
+    }
 
     @ApiOperation(value = "新增", notes = " 传入 MusicSheetAuthRecord")
     @PostMapping("/save")

cooleshow-app/src/main/java/com/yonge/cooleshow/website/controller/MusicSheetAuthRecordController.java

@@ -1,17 +1,20 @@
 package com.yonge.cooleshow.website.controller;
 
+import com.yonge.cooleshow.biz.dal.dto.search.TeacherMusicSheetAuditSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheetAuthRecord;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetAuthRecordService;
 import com.yonge.cooleshow.biz.dal.service.SysUserService;
+import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
+import com.yonge.cooleshow.biz.dal.vo.TeacherMusicSheetVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
@@ -21,6 +24,21 @@ import javax.annotation.Resource;
 public class MusicSheetAuthRecordController extends BaseController {
     @Resource
     private MusicSheetAuthRecordService musicSheetAuthRecordService;
+    @Resource
+    private SysUserService sysUserService;
+
+    @PostMapping(value = "/list", consumes="application/json", produces="application/json")
+    @ApiOperation(value = "审核中心-乐谱审核列表", httpMethod="POST", consumes="application/json", produces="application/json")
+    public HttpResponseResult<PageInfo<TeacherMusicSheetVo>> audit(@RequestBody TeacherMusicSheetAuditSearch query) {
+        query.setCreateBy(sysUserService.getUserId());
+        return succeed(PageUtil.pageInfo(musicSheetAuthRecordService.selectAuditPage(PageUtil.getPage(query),query)));
+    }
+
+    @GetMapping(value = "/auditDetail/{musicSheetAuthRecordId}")
+    @ApiOperation(value = "审核中心-乐谱审核详情",  notes = "传入曲目审核id")
+    public HttpResponseResult<MusicSheetDetailVo> auditDetail(@PathVariable Long musicSheetAuthRecordId) {
+        return succeed(musicSheetAuthRecordService.auditDetail(musicSheetAuthRecordId));
+    }
 
     @ApiOperation(value = "新增", notes = " 传入 MusicSheetAuthRecord")
     @PostMapping("/save")

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

@@ -51,6 +51,9 @@ public class TeacherMusicSheetAuditReq {
     @ApiModelProperty("是否可以转简谱（0:否，1：是）")
     private YesOrNoEnum notation;
 
+    @ApiModelProperty(value = "曲目配置")
+    private String extConfigJson;
+
     @ApiModelProperty(value = "是否可以评测(0:否;1:是)")
     private YesOrNoEnum canEvaluate;  //是否可以评测(0:否;1:是)
 

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

@@ -5,21 +5,15 @@ import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.ChargeTypeEnum;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.page.QueryInfo;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
-/**
- * Description 老师乐谱审核
- *
- * @author liujunchi
- * @date 2022-04-02
- */
 @ApiModel(value = "TeacherMusicSheetAuditSearch", description = "老师乐谱审核查询")
+@Data
 public class TeacherMusicSheetAuditSearch extends QueryInfo{
 
     @ApiModelProperty("老师编号/名称/电话")
@@ -53,75 +47,6 @@ public class TeacherMusicSheetAuditSearch extends QueryInfo{
     @ApiModelProperty(value = "精品标志(0:否;1:是)")
     private YesOrNoEnum exquisiteFlag;
 
-    public Integer getFirstAuth() {
-        return firstAuth;
-    }
-
-    public void setFirstAuth(Integer firstAuth) {
-        this.firstAuth = firstAuth;
-    }
-
-    public ChargeTypeEnum getChargeType() {
-        return chargeType;
-    }
-
-    public void setChargeType(ChargeTypeEnum chargeType) {
-        this.chargeType = chargeType;
-    }
-
-    public String getIdAndName() {
-        return idAndName;
-    }
-
-    public void setIdAndName(String idAndName) {
-        this.idAndName = idAndName;
-    }
-
-    public String getAuditName() {
-        return auditName;
-    }
-
-    public void setAuditName(String auditName) {
-        this.auditName = auditName;
-    }
-
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-
-    public AuthStatusEnum getAuthStatus() {
-        return authStatus;
-    }
-
-    public void setAuthStatus(AuthStatusEnum authStatus) {
-        this.authStatus = authStatus;
-    }
-
-    public Boolean getDelFlag() {
-        return delFlag;
-    }
-
-    public void setDelFlag(Boolean delFlag) {
-        this.delFlag = delFlag;
-    }
-
-	public YesOrNoEnum getExquisiteFlag() {
-		return exquisiteFlag;
-	}
-
-	public void setExquisiteFlag(YesOrNoEnum exquisiteFlag) {
-		this.exquisiteFlag = exquisiteFlag;
-	}
+    @ApiModelProperty(value = "创建人id")
+    private Long createBy;
 }

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

@@ -103,6 +103,10 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
             addMusicSheet.setMusicImg(param.getMusicImg());
             addMusicSheet.setMusicFirstImg(param.getMusicFirstImg());
             addMusicSheet.setMusicJianImg(param.getMusicJianImg());
+            addMusicSheet.setExtConfigJson(param.getExtConfigJson());
+            addMusicSheet.setIsEvaluated(param.getCanEvaluate()==YesOrNoEnum.YES);
+            addMusicSheet.setIsPlayBeat(true);
+            addMusicSheet.setIsUseSystemBeat(param.getHasBeat()!=YesOrNoEnum.YES);
             if(musicSheet.getCbsMusicSheetId() == null){
                 musicSheet.setCbsMusicSheetId(IdWorker.getId());
             }

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

@@ -66,6 +66,15 @@
             </if>
             <if test="param.authStatus != null">
                 and msar.audit_state_ = #{param.authStatus}
+                <if test="param.authStatus == 'PASS'">
+                    AND ms.state_ = 1
+                </if>
+                <if test="param.authStatus == 'OUT_SALE'">
+                    AND ms.state_ = 0
+                </if>
+            </if>
+            <if test="param.createBy != null">
+                and ms.create_by_ = #{param.createBy}
             </if>
             <if test="param.startTime != null">
                 and ms.create_time_ &gt; #{param.startTime}