版本号代码,兼容文件属性不显示版本号后场景
This commit is contained in:
parent
4ce0d9b522
commit
60e85d25d9
@ -86,6 +86,8 @@ public class PrReportComment {
|
|||||||
dataMap.put(OutputWordUtil.PL_VERSION, "V" + repositoryModel.getVersion()+ ".0 " + date); // 版本
|
dataMap.put(OutputWordUtil.PL_VERSION, "V" + repositoryModel.getVersion()+ ".0 " + date); // 版本
|
||||||
|
|
||||||
OutputWordUtil.setRepositoryDefaultValue2(TARGET_METHOD_SCOPE, dataMap);// 设置属性默认值(空字符串)
|
OutputWordUtil.setRepositoryDefaultValue2(TARGET_METHOD_SCOPE, dataMap);// 设置属性默认值(空字符串)
|
||||||
|
//yujh 修改,统一使用版本工具类获取版本号,兼容文件属性中的版本号取消场景
|
||||||
|
dataMap.put("pl_P_versions", VersionUtil.getVersionStrV(repositoryModel.getVersion()));
|
||||||
JSONArray propertyArr = CoeProcessLevelUtil.getProcessLevelPropertyArr(repositoryModel.getId());
|
JSONArray propertyArr = CoeProcessLevelUtil.getProcessLevelPropertyArr(repositoryModel.getId());
|
||||||
for (int i = 0; i < propertyArr.size(); i++) {
|
for (int i = 0; i < propertyArr.size(); i++) {
|
||||||
JSONObject propertyObj = propertyArr.getJSONObject(i);
|
JSONObject propertyObj = propertyArr.getJSONObject(i);
|
||||||
@ -273,6 +275,8 @@ public class PrReportComment {
|
|||||||
|
|
||||||
OutputWordUtil.setRepositoryDefaultValue2(TARGET_METHOD_SCOPE, dataMap);// 设置属性默认值(空字符串)
|
OutputWordUtil.setRepositoryDefaultValue2(TARGET_METHOD_SCOPE, dataMap);// 设置属性默认值(空字符串)
|
||||||
//System.out.println("表单数据内容获取==================");
|
//System.out.println("表单数据内容获取==================");
|
||||||
|
//yujh 修改,统一使用版本工具类获取版本号,兼容文件属性中的版本号取消场景
|
||||||
|
dataMap.put("pl_P_versions", VersionUtil.getVersionStrV(repositoryModel.getVersion()));
|
||||||
JSONArray propertyArr = CoeProcessLevelUtil.getProcessLevelPropertyArr(repositoryModel.getId());
|
JSONArray propertyArr = CoeProcessLevelUtil.getProcessLevelPropertyArr(repositoryModel.getId());
|
||||||
for (int i = 0; i < propertyArr.size(); i++) {
|
for (int i = 0; i < propertyArr.size(); i++) {
|
||||||
JSONObject propertyObj = propertyArr.getJSONObject(i);
|
JSONObject propertyObj = propertyArr.getJSONObject(i);
|
||||||
|
|||||||
@ -81,7 +81,8 @@ public class PrReportComment {
|
|||||||
dataMap.put(OutputWordUtil.PL_VERSION, "V" + repositoryModel.getVersion()+ ".0 " + date); // 版本
|
dataMap.put(OutputWordUtil.PL_VERSION, "V" + repositoryModel.getVersion()+ ".0 " + date); // 版本
|
||||||
|
|
||||||
OutputWordUtil.setRepositoryDefaultValue2(TARGET_METHOD_SCOPE, dataMap);// 设置属性默认值(空字符串)
|
OutputWordUtil.setRepositoryDefaultValue2(TARGET_METHOD_SCOPE, dataMap);// 设置属性默认值(空字符串)
|
||||||
|
//yujh 修改,统一使用版本工具类获取版本号,兼容文件属性中的版本号取消场景
|
||||||
|
dataMap.put("pl_P_versions", VersionUtil.getVersionStrV(repositoryModel.getVersion()));
|
||||||
JSONArray propertyArr = CoeProcessLevelUtil.getProcessLevelPropertyArr(repositoryModel.getId());
|
JSONArray propertyArr = CoeProcessLevelUtil.getProcessLevelPropertyArr(repositoryModel.getId());
|
||||||
for (int i = 0; i < propertyArr.size(); i++) {
|
for (int i = 0; i < propertyArr.size(); i++) {
|
||||||
JSONObject propertyObj = propertyArr.getJSONObject(i);
|
JSONObject propertyObj = propertyArr.getJSONObject(i);
|
||||||
|
|||||||
@ -101,6 +101,8 @@ public class PrReportComment {
|
|||||||
|
|
||||||
OutputWordUtil.setRepositoryDefaultValue2(TARGET_METHOD_SCOPE, dataMap);// 设置属性默认值(空字符串)
|
OutputWordUtil.setRepositoryDefaultValue2(TARGET_METHOD_SCOPE, dataMap);// 设置属性默认值(空字符串)
|
||||||
|
|
||||||
|
//yujh 修改,统一使用版本工具类获取版本号,兼容文件属性中的版本号取消场景
|
||||||
|
dataMap.put("pl_versions", VersionUtil.getVersionStrV(repositoryModel.getVersion()));
|
||||||
JSONArray propertyArr = CoeProcessLevelUtil.getProcessLevelPropertyArr(repositoryModel.getId());
|
JSONArray propertyArr = CoeProcessLevelUtil.getProcessLevelPropertyArr(repositoryModel.getId());
|
||||||
for (int i = 0; i < propertyArr.size(); i++) {
|
for (int i = 0; i < propertyArr.size(); i++) {
|
||||||
JSONObject propertyObj = propertyArr.getJSONObject(i);
|
JSONObject propertyObj = propertyArr.getJSONObject(i);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user