diff --git a/com.awspaas.user.apps.coe.pal.output.bd/lib/com.awspaas.user.apps.coe.pal.output.bd.jar b/com.awspaas.user.apps.coe.pal.output.bd/lib/com.awspaas.user.apps.coe.pal.output.bd.jar index c5bcc662..f2414818 100644 Binary files a/com.awspaas.user.apps.coe.pal.output.bd/lib/com.awspaas.user.apps.coe.pal.output.bd.jar and b/com.awspaas.user.apps.coe.pal.output.bd/lib/com.awspaas.user.apps.coe.pal.output.bd.jar differ diff --git a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java index b50d87a4..88d65822 100644 --- a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java +++ b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java @@ -14,6 +14,7 @@ import com.actionsoft.apps.coe.pal.pal.output.util.OutputWordUtil; import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryQueryAPIManager; import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache; import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryPropertyCache; +import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.cache.DesignerShapeRelationCache; import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.dao.DesignerShapeRelationDao; import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.model.DesignerShapeRelationModel; import com.actionsoft.apps.coe.pal.pal.repository.designer.util.CoeDesignerUtil; @@ -414,6 +415,46 @@ public class Report1Gener { dataMap.put(OutputWordUtil.TABLE_REGULATE, regulateTable); dataMap.put(OutputWordUtil.TABLE_KPI, KPITable); ReportRepositoryCompare compare = new ReportRepositoryCompare(); + + + + + //相关/支持文件 + List relationList = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "support_files"); + + JSONArray supportfiles = new JSONArray(); + + relationList.sort(Comparator.comparing(DesignerShapeRelationModel::getShapeText)); + + int index = 0; + if (relationList.size() > 0) { + for (DesignerShapeRelationModel relation : relationList) { + String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID + String name = null; + List models = PALRepositoryCache.getByVersionId(relationFileId); + if (models != null && models.size() > 0) { + index++; + for (PALRepositoryModel oneModel : models) { + if (oneModel.isUse() == true) { + name = oneModel.getName(); + } + } + } + + JSONObject tmp = new JSONObject(); + tmp.put("name", name); + tmp.put("desc", index); + supportfiles.add(tmp); + } + } + + + //相关/支持文件 + dataMap.put("supports_table", supportfiles);//table6 + dataMap.put("supports_table_count", supportfiles.size());//table6 + + + // JSONArray historyVersionModify = compare.getModifyVersionHistory(repositoryId); // dataMap.put("history_table", historyVersionModify); diff --git a/com.awspaas.user.apps.coe.pal.output.bd/表单-手册2.xml b/com.awspaas.user.apps.coe.pal.output.bd/表单-手册2.xml index c6f56db2..a82fc98c 100644 --- a/com.awspaas.user.apps.coe.pal.output.bd/表单-手册2.xml +++ b/com.awspaas.user.apps.coe.pal.output.bd/表单-手册2.xml @@ -1,29 +1,29 @@ + xmlns:aml="http://schemas.microsoft.com/aml/2001/core" + xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" + xmlns:cx="http://schemas.microsoft.com/office/drawing/2014/chartex" + xmlns:cx1="http://schemas.microsoft.com/office/drawing/2015/9/8/chartex" + xmlns:cx2="http://schemas.microsoft.com/office/drawing/2015/10/21/chartex" + xmlns:cx3="http://schemas.microsoft.com/office/drawing/2016/5/9/chartex" + xmlns:cx4="http://schemas.microsoft.com/office/drawing/2016/5/10/chartex" + xmlns:cx5="http://schemas.microsoft.com/office/drawing/2016/5/11/chartex" + xmlns:cx6="http://schemas.microsoft.com/office/drawing/2016/5/12/chartex" + xmlns:cx7="http://schemas.microsoft.com/office/drawing/2016/5/13/chartex" + xmlns:cx8="http://schemas.microsoft.com/office/drawing/2016/5/14/chartex" + xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:aink="http://schemas.microsoft.com/office/drawing/2016/ink" + xmlns:am3d="http://schemas.microsoft.com/office/drawing/2017/model3d" + xmlns:o="urn:schemas-microsoft-com:office:office" + xmlns:v="urn:schemas-microsoft-com:vml" + xmlns:w10="urn:schemas-microsoft-com:office:word" + xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" + xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" + xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" + xmlns:wsp="http://schemas.microsoft.com/office/word/2003/wordml/sp2" + xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" w:macrosPresent="no" w:embeddedObjPresent="no" w:ocxPresent="no" xml:space="preserve"> 洪继程 @@ -2924,6 +2924,7 @@ y7fdOgAAAABJRU5ErkJggk== --> + @@ -3285,7 +3286,7 @@ y7fdOgAAAABJRU5ErkJggk== - <#list version_history_table as table6> + <#list version_history_table as table6> @@ -3593,138 +3594,360 @@ y7fdOgAAAABJRU5ErkJggk== - - - + + + + + + + + + + + + + + + + + + + 相关/支持文件 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 序号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 文件名称 + + + + + + + + + + <#list supports_table as table7> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${table7.desc} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${table7.name} + + + + + - - --> - + + + + + + + + @@ -3732,12 +3955,12 @@ y7fdOgAAAABJRU5ErkJggk== - + - - - + + + - \ No newline at end of file + \ No newline at end of file