From d95848276831e7fd954d475a848bd26a3087ee93 Mon Sep 17 00:00:00 2001 From: anhc <3442943606@qq.com> Date: Sun, 17 Jul 2022 16:16:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=94=9F=E6=88=90=E5=99=A8?= =?UTF-8?q?=20=E5=88=B6=E5=BA=A6=E6=89=8B=E5=86=8C=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com.awspaas.apps.coe.pal.output.zd.jar | 0 ...om.awspaas.user.apps.coe.pal.output.zd.jar | Bin 61670 -> 62812 bytes .../pal/output/zd/report1/Report1Gener.java | 14 ++++++++++---- 3 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.apps.coe.pal.output.zd.jar diff --git a/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.apps.coe.pal.output.zd.jar b/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.apps.coe.pal.output.zd.jar deleted file mode 100644 index e69de29b..00000000 diff --git a/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar b/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar index b508281486730bb0dd1ff7730d814776c0b36a1f..7eb657d7a21f34125193a973b0f14458bc523f8b 100644 GIT binary patch delta 18034 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 aSk4D&rhoh3!sm9$PQLI#fNjG|kZk~YpMGWl delta 16439 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

NEz6MtmmJC(*MqWjr>?vW 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 Vqq_bQMf)j$G7o4l0*C*M{y*pzbL0R3 diff --git a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java index 911012d8..018991c1 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java +++ b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java @@ -160,7 +160,7 @@ public class Report1Gener { } JSONObject dataMap = getData(repositoryId, wizardJsonData, docPath, fileName); if (dataMap != null) { - OutputWordUtil.createDoc2(dataMap, tempPath, tempName, docName); +// OutputWordUtil.createDoc2(dataMap, tempPath, tempName, docName); } } } @@ -228,9 +228,9 @@ public class Report1Gener { int regulateIndex = 1;// 控制序号 for (Map shape : repositoryFileElements) { //如果图形元素不是流程步骤,不导出该元素 - if (PrReportComment.PROCESS_STEP.indexOf((String)shape.get("type")) == -1) { - continue; - } +// if (PrReportComment.PROCESS_STEP.indexOf((String)shape.get("type")) == -1) { +// continue; +// } JSONObject _tr = new JSONObject(); OutputWordUtil.setShapeDefaultValue2(repositoryId, _tr); //设置默认值 _tr.put(OutputWordUtil.SERIAL_NUMBER, index); //序号 @@ -448,12 +448,18 @@ public class Report1Gener { //术语 dataMap.put("term_table", termTable);//table4 + //如果termTable.size()==0 则显示无 + dataMap.put("term_table_count", termTable.size());//table4 + //组织和职责 dataMap.put("organization_table", organizationTable);//table5 + dataMap.put("organization_table_count",organizationTable.size());//table5 //支持文件 dataMap.put("supports_table", support_files);//table6 + dataMap.put("supports_table_count", support_files.size());//table6 //相关文件 dataMap.put("relevant_table", related_files);//table7 + dataMap.put("relevant_table_count", related_files.size());//table7 dataMap.put(OutputWordUtil.TABLE_REPOSITORY_SHAPE, repositoryShapeTable);