ソースを参照

生成soc卡word的模板

Zimo 7 時間 前
コミット
2106b85675

+ 6 - 6
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/util/SafetyObservationCardGenerator.java

@@ -107,9 +107,9 @@ public class SafetyObservationCardGenerator {
 
         // 行3:个人防护 | 规范操作 | 观察描述
         XWPFTableRow headerRow1 = table.createRow();
-        setTipTextStyle(headerRow1.getCell(0), "个人防护□", true, ParagraphAlignment.LEFT, "DCE6F1");
-        setTipTextStyle(headerRow1.getCell(1), "规范操作□", true, ParagraphAlignment.LEFT, "DCE6F1");
-        setTipTextStyle(headerRow1.getCell(2), "观察描述:", true, ParagraphAlignment.LEFT, "DCE6F1");
+        setCellStyle(headerRow1.getCell(0), "个人防护□", true, ParagraphAlignment.LEFT, "DCE6F1");
+        setCellStyle(headerRow1.getCell(1), "规范操作□", true, ParagraphAlignment.LEFT, "DCE6F1");
+        setCellStyle(headerRow1.getCell(2), "观察描述:", true, ParagraphAlignment.LEFT, "DCE6F1");
 
         // 行4:个人防护明细 | 规范操作明细 | 空
         XWPFTableRow row4 = table.createRow();
@@ -135,7 +135,7 @@ public class SafetyObservationCardGenerator {
         XWPFTableRow headerRow2 = table.createRow();
         setCellStyle(headerRow2.getCell(0), "规范指挥□", true, ParagraphAlignment.LEFT, "DCE6F1");
         setCellStyle(headerRow2.getCell(1), "人员位置□", true, ParagraphAlignment.LEFT, "DCE6F1");
-        setCellStyle(headerRow2.getCell(2), "", false, ParagraphAlignment.LEFT, "E6EBF5");
+        setCellStyle(headerRow2.getCell(2), "", false, ParagraphAlignment.LEFT, "DCE6F1");
 
         // 行6:规范指挥明细 | 人员位置明细 | 安全行为描述
         XWPFTableRow row10 = table.createRow();
@@ -288,7 +288,7 @@ public class SafetyObservationCardGenerator {
         setRowHeight(row6, 1900);
         setCellStyle(row6.getCell(0), "", false, ParagraphAlignment.LEFT, "FFFFFF");
         setCellStyle(row6.getCell(1), "", false, ParagraphAlignment.LEFT, "FFFFFF");
-        setCellStyle(row6.getCell(2), "", true, ParagraphAlignment.LEFT, "E6EBF5");
+        setCellStyle(row6.getCell(2), "", false, ParagraphAlignment.LEFT, "FFFFFF");
 
         // 行7:空 | 空 | 纠正措施明细
         XWPFTableRow row7 = table.createRow();
@@ -452,7 +452,7 @@ public class SafetyObservationCardGenerator {
             paragraph.setSpacingAfter(50);
             paragraph.setSpacingBefore(0);
 
-            if (line.startsWith("□")) {
+            if (line.startsWith("□")||line.startsWith("☑")) {
                 paragraph.setIndentationFirstLine(288);
             } else {
                 paragraph.setIndentationFirstLine(144);