演练登记簿增加点评总结 代码提交

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -719,9 +719,6 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
     @Override
     public AjaxResult buildDrillTaskPdf(Long id) {
         CoreDrillTaskDetailVo task = this.selectCoreDrillTaskById(id);
-        if (ObjectUtil.isNotEmpty(task.getPdfUrl())) {
-            return AjaxResult.success(task.getPdfUrl());
-        }
         SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectOrgById(task.getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
         String fileName = getFileOrgName(sysOrg) + "_" + RegisterBookType.SAFETY_DRILL.getText() + "_" + DateUtil.format(new Date(), "yyyyMMddHHmmss") + ".pdf";
         Map<String, Object> data = this.getFtlDrill(task);
@@ -744,7 +741,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             registerBookPdf.setOrgPath(sysOrg.getPath());
             registerBookPdf.setFileUrl(pdfUrl);
             registerBookPdf.setFileName(StringUtils.substringAfterLast(pdfUrl, File.separator));
-            registerBookPdfService.save(registerBookPdf);
+            registerBookPdfService.saveOrUpdate(registerBookPdf);
 
 
         }, threadPoolTaskExecutor);
@@ -758,15 +755,15 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         String staticsPath = RemoteCallHandlerExecutor.executeRemoteCall(() -> fileService.getStaticPathPrefix(), ErrorMsgConstants.QUERY_FILE_PATH_ERROR).getData();
         String orgName = task.getOrgName();
         String drillSite = task.getDrillSite();
-        String imageData = task.getImageList();
-        String startTime = DateUtil.format(task.getDrillStartTime(), "yyyy-MM-dd HH:mm");
-        String endTime = DateUtil.format(task.getDrillEndTime(), "yyyy-MM-dd HH:mm");
+        String startTime = DateUtil.format(task.getDrillStartTime(), "yyyy年MM月dd日 HH:mm");
+        String endTime = DateUtil.format(task.getDrillEndTime(), "HH:mm");
         String drillTime = startTime + " - " + endTime;
         String hostName = task.getHostName() == null ? StringUtil.EMPTY_STRING : task.getHostName();
         String typeText = task.getTypeText() == null ? StringUtil.EMPTY_STRING : task.getTypeText();
         String presetCase = task.getPresetCase() == null ? StringUtil.EMPTY_STRING : task.getPresetCase();
         String drillSituation = task.getDrillSituation() == null ? StringUtil.EMPTY_STRING : task.getDrillSituation();
         String recorderName = task.getRecorderName() == null ? StringUtil.EMPTY_STRING : task.getRecorderName();
+        String comment = task.getComment() == null ? StringUtil.EMPTY_STRING : task.getComment();
 
         data.put("orgName", StringUtils.isNotEmpty(orgName) ? orgName : StringUtil.EMPTY_STRING);
         data.put("drillSite", StringUtils.isNotEmpty(drillSite) ? drillSite : StringUtil.EMPTY_STRING);
@@ -777,6 +774,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         data.put("recorderName", StringUtils.isNotEmpty(recorderName) ? recorderName : StringUtil.EMPTY_STRING);
         data.put("presetCase", StringUtils.isNotEmpty(presetCase) ? "预设案由: " + presetCase : StringUtil.EMPTY_STRING);
         data.put("drillSituation", StringUtils.isNotEmpty(drillSituation) ? "演练情况: " + drillSituation : StringUtil.EMPTY_STRING);
+        data.put("comment", StringUtils.isNotEmpty(comment) ? "点评总结: " + comment : StringUtil.EMPTY_STRING);
         List<CoreDrillTaskToUser> taskUserList = task.getTaskUserList();
         if (ObjectUtil.isEmpty(taskUserList)) {
             data.put("image", new ArrayList<>());

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

@@ -727,9 +727,6 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult buildEduPdf(Long id) {
         CoreEduTrainingTaskDetailVo task = this.selectCoreEduTrainingTaskById(id);
-        if (ObjectUtil.isNotEmpty(task.getPdfUrl())) {
-            return AjaxResult.success(task.getPdfUrl());
-        }
         SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectOrgById(task.getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
         String fileName = getFileOrgName(sysOrg) + "_" + RegisterBookType.EDUCATION_TRAINING.getText() + "_" + DateUtil.format(new Date(), "yyyyMMddHHmmss") + ".pdf";
         Map<String, Object> data = this.getFtlEdu(task);
@@ -755,7 +752,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             registerBookPdf.setOrgPath(sysOrg.getPath());
             registerBookPdf.setFileUrl(pdfUrl);
             registerBookPdf.setFileName(StringUtils.substringAfterLast(pdfUrl, File.separator));
-            registerBookPdfService.save(registerBookPdf);
+            registerBookPdfService.saveOrUpdate(registerBookPdf);
         }, threadPoolTaskExecutor);
 
         return AjaxResult.success("正在生成pdf，请稍后刷新页面查看!");

soc-modules/soc-modules-core/src/main/resources/mapper/letter/CoreIntroduceLetterMapper.xml

@@ -372,7 +372,7 @@
             resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
         select
         a.id,
-        a.reasons as taskName
+        a.reasons as taskName,
         a.start_time as startTime,
         a.end_time as endTime,
         a.effective_days,

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/service/LocalSysFileServiceImpl.java

@@ -91,7 +91,7 @@ public class LocalSysFileServiceImpl implements ISysFileService {
 
     private  PdfFilePathVo getLocalFilePath(String businessType, String fileName) {
         // 验证输入
-        if (!isValidFileName(fileName)) {
+        if (isValidFileName(fileName)) {
             throw new IllegalArgumentException("Invalid file name");
         }
         final String path = File.separator + businessType +

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

@@ -351,10 +351,7 @@ public class PdfUtil {
         //预设案由
         PdfPCell contentCell = new PdfPCell();
         contentCell.setColspan(6);
-        Paragraph content = new Paragraph();
-        String text = data.get("presetCase").toString();
-        content.add(new Chunk(text, tableFont));
-        contentCell.addElement(content);
+        contentCell.addElement(new Paragraph(new Chunk(data.get("presetCase").toString(), tableFont)));
         contentCell.setBorder(Rectangle.LEFT | Rectangle.RIGHT | Rectangle.BOTTOM);
         table.addCell(contentCell);
 
@@ -388,7 +385,7 @@ public class PdfUtil {
         signCell.addElement(signParagraph);
         signCell.setBorder(Rectangle.LEFT | Rectangle.RIGHT);
         table.addCell(signCell);
-        //图片填充
+        //签字区域-图片填充
         final PdfPTable imageTable = getImage((List<String>) data.get("image"), 12,100,100,3);
         final PdfPCell cell = new PdfPCell();
         cell.setNoWrap(false);
@@ -400,7 +397,11 @@ public class PdfUtil {
         cell.setBorder(Rectangle.LEFT | Rectangle.RIGHT | Rectangle.BOTTOM);
         cell.addElement(imageTable);
         table.addCell(cell);
-
+        //点评总结
+        PdfPCell commentCell = new PdfPCell();
+        commentCell.setColspan(6);
+        commentCell.addElement(new Paragraph(new Chunk(data.get("comment").toString(), tableFont)));
+        table.addCell(commentCell);
         //第三行
         createPDFCell(tableFont, table, "记录人", Element.ALIGN_CENTER, 1, 1);
         createPDFCell(tableFont, table, data.get("recorderName").toString(), Element.ALIGN_CENTER, 5, 1);
@@ -484,7 +485,7 @@ public class PdfUtil {
         try {
             final ApplicationContext applicationContext = SpringUtil.getApplicationContext();
             final Resource[] resources = applicationContext.getResources("classpath:file/black.png");
-            if(resources == null || resources.length == 0){
+            if (resources == null || resources.length == 0) {
                 return null;
             }
             return Image.getInstance(resources[0].getURL());