Merge remote-tracking branch 'origin/V0.0.7' into V0.0.7

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -339,6 +339,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             coreEduTrainingTask.setPlanCycle(EduTrainingPlanCycleEnum.NONE.getCode());
             coreEduTrainingTask.setCreateBy(SecurityUtils.getUserId().toString());
             coreEduTrainingTask.setCreateTime(new Date());
+            coreEduTrainingTask.setStatus(EduTrainingDoStatus.WAIT_RECORDED.getCode());
         }
         coreEduTrainingTask.setType(request.getType());
         coreEduTrainingTask.setTrainingStartDateTime(request.getTrainingStartDateTime());

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/utils/PdfUtil.java

@@ -244,9 +244,9 @@ public class PdfUtil {
 
         final List<LinkedHashMap> questionPdfVoList = (List<LinkedHashMap>) data.get("questions");
         if (ObjectUtil.isEmpty(questionPdfVoList)) {
-            PdfUtil.createPDFCell(tableFont, table, "无", Element.ALIGN_MIDDLE, 2, 1);
-            PdfUtil.createPDFCell(tableFont, table, StringUtil.EMPTY_STRING, Element.ALIGN_LEFT, 4, 1);
-            PdfUtil.createPDFCell(tableFont, table, StringUtil.EMPTY_STRING, Element.ALIGN_MIDDLE, 4, 1);
+            PdfUtil.createPDFCell(tableFont, table, "/", Element.ALIGN_MIDDLE, 2, 1);
+            PdfUtil.createPDFCell(tableFont, table, "/", Element.ALIGN_MIDDLE, 4, 1);
+            PdfUtil.createPDFCell(tableFont, table, "/", Element.ALIGN_MIDDLE, 4, 1);
             document.add(table);
             return;
         }