Browse Source

fix:导入

liujunchi 3 years ago
parent
commit
7378176751

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

@@ -590,6 +590,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void importExcel(List<ExcelDataReaderProperty<MusicSheetExport>> dataList, Long userId) {
 
         List<ErrMsg> errMsgList = new ArrayList<>();
@@ -597,7 +598,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
         List<MusicSheetDto> musicSheetDtoList = new ArrayList<>();
         List<MusicTagVo> musicTagVoList = musicTagService.selectMusicTagTree();
         List<Subject> subjects = subjectService.subjectSelect();
-
+        Date date = new Date();
         for (ExcelDataReaderProperty<MusicSheetExport> readerProperty : dataList) {
             MusicSheetDto musicSheetDto = new MusicSheetDto();
             musicSheetDto.setUserId(userId);
@@ -609,11 +610,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
             musicSheetDto.setDelFlag(false);
             musicSheetDto.setCreateBy(userId);
             musicSheetDto.setUpdateBy(userId);
-            musicSheetDto.setCreateTime(new Date());
-            musicSheetDto.setUpdateTime(new Date());
-            if(AudioTypeEnum.MIDI.getCode().equals(musicSheetDto.getAudioType().getCode())) {
-                musicSheetDto.setMp3Type(null);
-            }
+            musicSheetDto.setCreateTime(date);
+            musicSheetDto.setUpdateTime(date);
+
             String errMsg = readerProperty.getErrorMessage();
             if (!StringUtil.isEmpty(errMsg)) {
                 errMsgList.add(new ErrMsg(readerProperty.getRowIndex(), errMsg));
@@ -622,6 +621,10 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
             MusicSheetExport sheetExport = readerProperty.getClazz();
             BeanUtils.copyProperties(sheetExport,musicSheetDto);
 
+            if(AudioTypeEnum.MIDI.getCode().equals(musicSheetDto.getAudioType().getCode())) {
+                musicSheetDto.setMp3Type(null);
+            }
+
             if (musicSheetDto.getAudioType().equals(AudioTypeEnum.MP3)) {
                 musicSheetDto.setUrl(musicSheetDto.getMidiUrl());
                 musicSheetDto.setMidiUrl("");