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 85d6b8be..74cbd763 100644 Binary files a/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar and b/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar differ diff --git a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/Plugins.java b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/Plugins.java index 0481bbb6..39f60941 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/Plugins.java +++ b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/Plugins.java @@ -36,7 +36,7 @@ public class Plugins implements PluginListener { params1.put("targetMethodType", "");// 建模方法中的图元,为空表示只选择文件,不选择图元;为"-"表示所有类型图元 params1.put("relationMethodScope", "-");// 如果设置-,表示不需要用户选择关联范围,向导页被忽略*/ // 建模大类、建模方法,多个用逗号隔开,如果为空表示全部 org.normal - params1.put("targetMethodScope", "control.policy,process.scheme,engineering.standard"); + params1.put("targetMethodScope", "control.policy,process.scheme,engineering.standard,process.framework"); // 建模方法中的图元,为空表示只选择文件,不选择图元;为"-"表示所有类型图元 params1.put("targetMethodType", ""); // 如果设置-,表示不需要用户选择关联范围,向导页被忽略 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 b5d841fd..8c9fbc0a 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 @@ -91,7 +91,7 @@ public class Report1Gener { break; } } - PALRepositoryModel repositoryModel = PALRepositoryCache.getCache().get(jsonObj.get("targetFileId").toString()); + String tempName; if(PALRepositoryCache.getCache().get(targetFileId).getMethodId().equals("process.scheme")){ tempName = "方案-手册1.xml"; @@ -110,6 +110,7 @@ public class Report1Gener { log.info("end"); // xml转换成word格式 OutputWordUtil.xml2Word(log, dcContext.getPath()); + // } } finally { // isRunning = false; @@ -134,6 +135,13 @@ public class Report1Gener { if (repositoryId == null || "".equals(repositoryId)) { continue; } + + PALRepositoryModel repositoryModel1 = PALRepositoryCache.getCache().get(repositoryId); + if(repositoryModel1.getMethodId().equals("process.framework")){ + continue; + } + + PALRepositoryModel model = PALRepositoryQueryAPIManager.getInstance().queryPalRepositoryModelByPalId(repositoryId); if (model != null) { //获取文件扩展属性