1

science-admin/src/main/java/com/yiboshi/science/utils/TaskInfoToPDFUtil.java

@@ -38,8 +38,7 @@ public class TaskInfoToPDFUtil {
             // 宋体
             BaseFont sfChinese = loadChineseFont("simsun.ttc");
             // 仿宋
-//            BaseFont fsChinese = loadChineseFont("simfang.ttf");
-            BaseFont fsChinese = loadChineseFont("simsun.ttf");
+            BaseFont fsChinese = loadChineseFont("simfang.ttf");
             // WINGDNG2
             BaseFont WINGDNG2 = loadChineseFont("WINGDNG2.ttf");
 
@@ -241,7 +240,36 @@ public class TaskInfoToPDFUtil {
 
         addValueCell(projTable, "是否科技报告:", 2, dto.getIsTechnologyReport().equals(1) ? "是" : "否", 8, normalFont, null, null, null);
 
-        addValueCell(projTable, "科技报告类型:", 2, "", 8, normalFont, null, null, null);
+        if (Objects.nonNull(dto.getIsTechnologyReport()) && dto.getIsTechnologyReport().equals(1)) {
+            String commonTerms = "科技报告类型:";
+            Paragraph para = new Paragraph(commonTerms, normalFont);
+            para.setAlignment(Element.ALIGN_LEFT);
+            PdfPCell timeCell = new PdfPCell(para);
+            timeCell.setMinimumHeight(25.5f);
+            timeCell.setColspan(2);
+            timeCell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+            timeCell.setHorizontalAlignment(Element.ALIGN_LEFT);
+            timeCell.setCellEvent(new UniformBorderEvent());
+            timeCell.setPadding(5f);
+            timeCell.setBorderColor(new BaseColor(0, 0, 0));
+            projTable.addCell(timeCell);
+
+            String terms = "立项报告 份数 " + dto.getProjectReport() +
+                    "  进展报告 份数 " + dto.getProgressReport() +
+                    "  专题报告 份数 " + dto.getSpecialReport() +
+                    "  最终报告 份数 " + dto.getFinalReport();
+            Paragraph para2 = new Paragraph(terms, normalFont);
+            para.setAlignment(Element.ALIGN_LEFT);
+            PdfPCell timeCell2 = new PdfPCell(para2);
+            timeCell2.setMinimumHeight(25.5f);
+            timeCell2.setColspan(8);
+            timeCell2.setVerticalAlignment(Element.ALIGN_MIDDLE);
+            timeCell2.setHorizontalAlignment(Element.ALIGN_LEFT);
+            timeCell2.setCellEvent(new UniformBorderEvent());
+            timeCell2.setPadding(5f);
+            timeCell2.setBorderColor(new BaseColor(0, 0, 0));
+            projTable.addCell(timeCell2);
+        }
 
         addCell(projTable, "项目主要参与单位及分工", 10, null, normalFont, null, null, null);