Merge branch 'meiteng-2.0' into master-1.0.2

src/main/java/org/rcisoft/business/bchapter/service/impl/BChapterServiceImpl.java

@@ -868,10 +868,12 @@ public class BChapterServiceImpl implements BChapterService {
         String[] lessonIds = ids.split(",");
         String batchUDID = "批量下载打包" + System.currentTimeMillis();
         //遍历每个id
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
         for (String id : lessonIds) {
             List<BFile> fileList = bFileRepository.getFileByLessonId(id);
             //batch是zip打包文件夹     bFile.getLessonId()替换形成name
-            String filePath = global.getBASE_UPLOAD_SERVER_LOCATION() + global.getCOURSE_LOCATION() + File.separator + batchUDID + File.separator + bLessonRepository.selectByPrimaryKey(id).getLessonName();
+            BLesson bLesson = bLessonRepository.selectByPrimaryKey(id);
+            String filePath = global.getBASE_UPLOAD_SERVER_LOCATION() + global.getCOURSE_LOCATION() + File.separator + batchUDID + File.separator + bLesson.getLessonName() + simpleDateFormat.format(bLesson.getCreateDate());
             File file = new File(filePath);
             if (fileList == null || fileList.size() < 1)
                 continue;