diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/PrReportComment.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/PrReportComment.java index e8fbb90c..7675f707 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/PrReportComment.java +++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/PrReportComment.java @@ -86,6 +86,8 @@ public class PrReportComment { dataMap.put(OutputWordUtil.PL_VERSION, "V" + repositoryModel.getVersion()+ ".0 " + date); // 版本 OutputWordUtil.setRepositoryDefaultValue2(TARGET_METHOD_SCOPE, dataMap);// 设置属性默认值(空字符串) + //yujh 修改,统一使用版本工具类获取版本号,兼容文件属性中的版本号取消场景 + dataMap.put("pl_P_versions", VersionUtil.getVersionStrV(repositoryModel.getVersion())); JSONArray propertyArr = CoeProcessLevelUtil.getProcessLevelPropertyArr(repositoryModel.getId()); for (int i = 0; i < propertyArr.size(); i++) { JSONObject propertyObj = propertyArr.getJSONObject(i); @@ -273,6 +275,8 @@ public class PrReportComment { OutputWordUtil.setRepositoryDefaultValue2(TARGET_METHOD_SCOPE, dataMap);// 设置属性默认值(空字符串) //System.out.println("表单数据内容获取=================="); + //yujh 修改,统一使用版本工具类获取版本号,兼容文件属性中的版本号取消场景 + dataMap.put("pl_P_versions", VersionUtil.getVersionStrV(repositoryModel.getVersion())); JSONArray propertyArr = CoeProcessLevelUtil.getProcessLevelPropertyArr(repositoryModel.getId()); for (int i = 0; i < propertyArr.size(); i++) { JSONObject propertyObj = propertyArr.getJSONObject(i); diff --git a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/PrReportComment.java b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/PrReportComment.java index 25ffc27b..af57fdf9 100644 --- a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/PrReportComment.java +++ b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/PrReportComment.java @@ -81,7 +81,8 @@ public class PrReportComment { dataMap.put(OutputWordUtil.PL_VERSION, "V" + repositoryModel.getVersion()+ ".0 " + date); // 版本 OutputWordUtil.setRepositoryDefaultValue2(TARGET_METHOD_SCOPE, dataMap);// 设置属性默认值(空字符串) - + //yujh 修改,统一使用版本工具类获取版本号,兼容文件属性中的版本号取消场景 + dataMap.put("pl_P_versions", VersionUtil.getVersionStrV(repositoryModel.getVersion())); JSONArray propertyArr = CoeProcessLevelUtil.getProcessLevelPropertyArr(repositoryModel.getId()); for (int i = 0; i < propertyArr.size(); i++) { JSONObject propertyObj = propertyArr.getJSONObject(i); diff --git a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/util/PrReportComment.java b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/util/PrReportComment.java index fd52fed7..2f1efc32 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/util/PrReportComment.java +++ b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/util/PrReportComment.java @@ -101,6 +101,8 @@ public class PrReportComment { OutputWordUtil.setRepositoryDefaultValue2(TARGET_METHOD_SCOPE, dataMap);// 设置属性默认值(空字符串) + //yujh 修改,统一使用版本工具类获取版本号,兼容文件属性中的版本号取消场景 + dataMap.put("pl_versions", VersionUtil.getVersionStrV(repositoryModel.getVersion())); JSONArray propertyArr = CoeProcessLevelUtil.getProcessLevelPropertyArr(repositoryModel.getId()); for (int i = 0; i < propertyArr.size(); i++) { JSONObject propertyObj = propertyArr.getJSONObject(i);