pssr部分导出

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSubcontentController.java

@@ -183,7 +183,11 @@ public class TPssrSubcontentController extends BaseController {
                     signRow = Rows.of("", "CTM 经理确认：                    日期：", "", "", "", "").verticalCenter().textBold().rowExactHeight(1.1f).create();
                 }
                 if (subcontent.getDeptUnit().equals("CTA")) {
-                    cta = count + 2;
+                    if (ctm == 0) {
+                        cta = count + 1;
+                    } else {
+                        cta = count + 2;
+                    }
                     signRow = Rows.of("", "CTA 经理确认：                    日期：", "", "", "", "").verticalCenter().textBold().rowExactHeight(1.1f).create();
                 }
                 // 添加经理审批签字数据
@@ -261,19 +265,19 @@ public class TPssrSubcontentController extends BaseController {
                     .map(MergeCellRule.Grid.of(plant + 1, 0), MergeCellRule.Grid.of(cta, 0))
                     .map(MergeCellRule.Grid.of(cta, 1), MergeCellRule.Grid.of(cta, 5));
         } else if (plant == 0 && ctm > 0 && cta > 0) {
-            rule.map(MergeCellRule.Grid.of(1, 0), MergeCellRule.Grid.of(ctm-1, 0))
-                    .map(MergeCellRule.Grid.of(ctm-1, 1), MergeCellRule.Grid.of(ctm-1, 5))
+            rule.map(MergeCellRule.Grid.of(1, 0), MergeCellRule.Grid.of(ctm - 1, 0))
+                    .map(MergeCellRule.Grid.of(ctm - 1, 1), MergeCellRule.Grid.of(ctm - 1, 5))
                     .map(MergeCellRule.Grid.of(ctm + 1, 0), MergeCellRule.Grid.of(cta, 0))
                     .map(MergeCellRule.Grid.of(cta, 1), MergeCellRule.Grid.of(cta, 5));
         } else if (plant > 0 && ctm == 0 && cta == 0) {
             rule.map(MergeCellRule.Grid.of(1, 0), MergeCellRule.Grid.of(plant, 0))
                     .map(MergeCellRule.Grid.of(plant, 1), MergeCellRule.Grid.of(plant, 5));
         } else if (plant == 0 && ctm > 0 && cta == 0) {
-            rule.map(MergeCellRule.Grid.of(1, 0), MergeCellRule.Grid.of(ctm-1, 0))
-                    .map(MergeCellRule.Grid.of(ctm-1, 1), MergeCellRule.Grid.of(ctm-1, 5));
+            rule.map(MergeCellRule.Grid.of(1, 0), MergeCellRule.Grid.of(ctm - 1, 0))
+                    .map(MergeCellRule.Grid.of(ctm - 1, 1), MergeCellRule.Grid.of(ctm - 1, 5));
         } else if (plant == 0 && ctm == 0 && cta > 0) {
-            rule.map(MergeCellRule.Grid.of(1, 0), MergeCellRule.Grid.of(cta-2, 0))
-                    .map(MergeCellRule.Grid.of(cta-2, 1), MergeCellRule.Grid.of(cta-2, 5));
+            rule.map(MergeCellRule.Grid.of(1, 0), MergeCellRule.Grid.of(cta - 2, 0))
+                    .map(MergeCellRule.Grid.of(cta - 2, 1), MergeCellRule.Grid.of(cta - 2, 5));
         }
 
         tableRenderData.setMergeRule(rule.build());