报告生成器 制度手册生成调整

This commit is contained in:
anhc 2022-07-17 16:16:12 +08:00
parent ad98fbdf69
commit d958482768
3 changed files with 10 additions and 4 deletions

View File

@ -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<String, Object> 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);