酷乐秀曲目来源改为内容平台

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

@@ -44,14 +44,14 @@ public class MusicSheetAuthRecordController extends BaseController {
     }
 
 
-    @GetMapping(value = "/auditDetail/{authMusicSheetId}")
+    @GetMapping(value = "/auditDetail/{musicSheetAuthRecordId}")
     @ApiOperation(value = "审核中心-乐谱审核详情",  notes = "传入曲目审核id")
     public HttpResponseResult<MusicSheetDetailVo> auditDetail(@PathVariable Long musicSheetAuthRecordId) {
         return succeed(musicSheetAuthRecordService.auditDetail(musicSheetAuthRecordId));
     }
 
-    @GetMapping(value = "/auditDetailList/{musicSheetAuthRecordId}")
-    @ApiOperation(value = "审核中心-乐谱审核详情历史记录",  notes = "传入曲目审核id")
+    @GetMapping(value = "/auditDetailList/{batchNo}")
+    @ApiOperation(value = "审核中心-乐谱审核详情历史记录",  notes = "传入曲目审核批次号")
     public HttpResponseResult<List<MusicSheetDetailVo>> auditDetailList(@PathVariable String batchNo) {
         return succeed(musicSheetAuthRecordService.auditDetailList(batchNo));
     }

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

@@ -5,17 +5,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.MusicSheetDao;
 import com.yonge.cooleshow.biz.dal.dto.MusicImgDto;
-import com.yonge.cooleshow.biz.dal.dto.MusicSheetDto;
-import com.yonge.cooleshow.biz.dal.dto.MusicSheetExport;
 import com.yonge.cooleshow.biz.dal.dto.ReasonDto;
 import com.yonge.cooleshow.biz.dal.dto.req.OrderReq;
-import com.yonge.cooleshow.biz.dal.dto.req.TeacherMusicSheetAuditReq;
-import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumDetailSearch;
-import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
-import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetOrderSearch;
-import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetSearch;
-import com.yonge.cooleshow.biz.dal.dto.search.TeacherMusicSheetAuditSearch;
-import com.yonge.cooleshow.biz.dal.dto.search.TeacherMusicSheetSearch;
+import com.yonge.cooleshow.biz.dal.dto.search.*;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.OrderTypeEnum;
@@ -24,7 +16,6 @@ import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
 import com.yonge.cooleshow.biz.dal.wrapper.UserPaymentOrderWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.music.MusicCompareWrapper;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.toolset.utils.easyexcel.ExcelDataReaderProperty;
 
 import java.math.BigDecimal;
 import java.util.List;

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

@@ -31,7 +31,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -168,7 +167,6 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Integer addRecord(MusicSheetAuthRecord musicSheetAuthRecord) {
-        this.checkRecord(musicSheetAuthRecord);
         //保存曲目信息
         MusicSheet musicSheet = musicSheetService.initMusicSheet(musicSheetAuthRecord.getMusicSheetJson());
         musicSheetService.save(musicSheet);

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

@@ -85,8 +85,8 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
 
     @Resource
     private MusicSheetDao musicSheetDao;
-    @Resource
-    private MusicSheetAccompanimentService musicSheetAccompanimentService;
+//    @Resource
+//    private MusicSheetAccompanimentService musicSheetAccompanimentService;
     @Resource
     private MusicFavoriteService musicFavoriteService;
     @Resource
@@ -2411,13 +2411,11 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
      */
     @Override
     public Boolean updateMusicCorrect(MusicImgDto musicImgDto, Long musicSheetId) {
-
         MusicSheet musicSheet = new MusicSheet();
         musicSheet.setCorrectTime(DateTime.now().toDate());
         musicSheet.setFixedTone(musicImgDto.getFixedTone());
         musicSheet.setId(musicSheetId);
         this.updateById(musicSheet);
-
         return true;
     }
 
@@ -2432,6 +2430,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             throw new BizException("曲目应用不能为空");
         }
         MusicSheet musicSheetAudit = new MusicSheet();
+        musicSheetAudit.setSubmitAuditTime(new Date());
         musicSheetAudit.setProviderType(SourceTypeEnum.TEACHER);
         musicSheetAudit.setSourceType(SourceTypeEnum.TEACHER);
         musicSheetAudit.setAuditStatus(AuthStatusEnum.DOING);

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

@@ -51,7 +51,7 @@
         left join sys_user su on su.id_ = ms.create_by_
         left join sys_user su2 on msar.verify_user_id_ = su2.id_
         <where>
-            su.del_flag_ = 0 and
+            su.del_flag_ = 0 AND
             ms.source_type_  = 'TEACHER'
             <if test="param.idAndName != null and param.idAndName != ''">
                 and (su.id_ like concat('%',#{param.idAndName} ,'%')