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

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

@@ -172,7 +172,7 @@ public interface MusicSheetDao extends BaseMapper<MusicSheet> {
      * @param musicSheetId 曲目id
      * @return
      */
-    List<MusicSheetWrapper.MusicSheetDetailVo> auditDetailList(@Param("musicSheetId") Long musicSheetId, @Param("batchNo") String batchNo);
+    List<MusicSheetWrapper.MusicSheetDetailVo> auditDetailList(@Param("batchNo") String batchNo);
 
     /**
      * 单曲数量统计

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

@@ -249,6 +249,7 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
         musicSheetAuthRecord.setAuditState(AuthStatusEnum.DOING);
         musicSheetAuthRecord.setMusicSheetId(musicSheet.getId());
         musicSheetAuthRecord.setMusicSheetJson(JSON.toJSONString(addMusicSheet));
+        musicSheetAuthRecord.setId(IdWorker.getId());
         return baseMapper.insert(musicSheetAuthRecord);
     }
 
@@ -294,7 +295,7 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
             musicSheetAuthRecord.setBatchNo(record.getBatchNo());
             musicSheetAuthRecord.setAuditState(AuthStatusEnum.DOING);
             musicSheetAuthRecord.setMusicSheetJson(JSON.toJSONString(addMusicSheet));
-            baseMapper.insert(musicSheetAuthRecord);
+            baseMapper.updateById(musicSheetAuthRecord);
         }
     }
 
@@ -316,7 +317,7 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
 
     @Override
     public List<MusicSheetWrapper.MusicSheetDetailVo> auditDetailList(String batchNo) {
-        List<MusicSheetWrapper.MusicSheetDetailVo> sheetDetailVos = musicSheetService.getDao().auditDetailList(null, batchNo);
+        List<MusicSheetWrapper.MusicSheetDetailVo> sheetDetailVos = musicSheetService.getDao().auditDetailList(batchNo);
         if (CollectionUtils.isNotEmpty(sheetDetailVos)) {
             String userName = sheetDetailVos.get(0).getUserName();
             String realName = sheetDetailVos.get(0).getRealName();

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

@@ -599,7 +599,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         MusicSheetDetailVo detailVo = baseMapper.detail(Long.parseLong(id));
         if (detailVo == null) {
             //获取待审核曲目信息
-            MusicSheetAuthRecord record = musicSheetAuthRecordService.lambdaQuery().eq(MusicSheetAuthRecord::getMusicSheetId, id).last("LIMIT 1").one();
+            MusicSheetAuthRecord record = musicSheetAuthRecordService.lambdaQuery().eq(MusicSheetAuthRecord::getId, id).last("LIMIT 1").one();
             if(Objects.nonNull(record)){
                 String musicSheetJson = record.getMusicSheetJson();
                 if(StringUtils.isNotEmpty(musicSheetJson)){

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

@@ -798,15 +798,12 @@
         ,msar.reason_ as auditReason
         ,msar.music_sheet_json_ as musicSheetJson
         ,msar.batch_no_ as batchNo
-        ,msar.music_sheet_id_ as id
+        ,msar.id_ as id
         from music_sheet_auth_record  msar
         left join music_sheet t on t.id_ = msar.music_sheet_id_
         left join sys_user su on su.id_ = t.create_by_
         left join sys_user su2 on msar.verify_user_id_ = su2.id_
         <where>
-            <if test="musicSheetId != null">
-                and #{musicSheetId} = msar.music_sheet_id_
-            </if>
             <if test="batchNo != null and batchNo != ''">
                 and #{batchNo} = msar.batch_no_
             </if>