From 8e495b7d0a8bab65f10d786f57cf8434abc97a45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BF=9F=E6=9E=97=E5=B8=86?= Date: Tue, 12 Jul 2022 13:42:51 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B=E6=89=8B?= =?UTF-8?q?=E5=86=8CBUG=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manifest.xml | 6 +- .../pal/output/pr/report1/Report1Gener.java | 72 +++++++++++-------- com.actionsoft.apps.coe.pal/manifest.xml | 2 +- .../repository/util/CoeProcessLevelUtil.java | 10 +-- .../manifest.xml | 2 +- .../manifest.xml | 2 +- 6 files changed, 56 insertions(+), 38 deletions(-) diff --git a/com.actionsoft.apps.coe.pal.output.pr/manifest.xml b/com.actionsoft.apps.coe.pal.output.pr/manifest.xml index 8c4f3c7c..97248b28 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/manifest.xml +++ b/com.actionsoft.apps.coe.pal.output.pr/manifest.xml @@ -3,7 +3,7 @@ 流程手册 1.0 - 28 + 29 北京炎黄盈动科技发展有限责任公司 6636fc53728276eb3baca55938356b74 false @@ -34,8 +34,8 @@ true - - + + cross diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java index c4883ea0..976ad0ee 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java +++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java @@ -192,6 +192,16 @@ public class Report1Gener { //流程绩效 List metrics = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "Process_performance_metrics"); + if (metrics.size() == 0) { + dataMap.put("pl_Name_process_performance_indicator", ""); + dataMap.put("pl_set_the_purpose", ""); + dataMap.put("pl_Index_definition", ""); + dataMap.put("pl_computational_formula", ""); + dataMap.put("pl_data_sources", ""); + dataMap.put("pl_unit_measurement", ""); + dataMap.put("pl_statistical_period", ""); + dataMap.put("pl_explain", ""); + } for (DesignerShapeRelationModel relation : metrics) { String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID String relationShapeId = relation.getRelationShapeId();//实例ID @@ -402,47 +412,53 @@ public class Report1Gener { JSONArray termTable = new JSONArray(); //术语定义Table // 属性特征 属性代码KEY PALRepositoryPropertyModel term = PALRepositoryPropertyCache.getPropertyByPropertyId(repositoryModel.getId(),"term"); - String termVal = term.getPropertyValue(); - JSONObject termObj = JSONObject.parseObject(termVal); - if (termObj != null && !termObj.isEmpty()) { - JSONArray tableArr = termObj.getJSONArray("table"); - if (tableArr != null && !tableArr.isEmpty()) { - for (Object obj : tableArr) { - JSONObject obj2 = (JSONObject) obj; - if (!"table_head".equals(obj2.getString("id"))) { - String name = obj2.getString("name"); - String desc = obj2.getString("desc"); - JSONObject tmp = new JSONObject(); - tmp.put("name", name); - tmp.put("desc", desc); - termTable.add(tmp); + if (term != null) { + String termVal = term.getPropertyValue(); + JSONObject termObj = JSONObject.parseObject(termVal); + if (termObj != null && !termObj.isEmpty()) { + JSONArray tableArr = termObj.getJSONArray("table"); + if (tableArr != null && !tableArr.isEmpty()) { + for (Object obj : tableArr) { + JSONObject obj2 = (JSONObject) obj; + if (!"table_head".equals(obj2.getString("id"))) { + String name = obj2.getString("name"); + String desc = obj2.getString("desc"); + JSONObject tmp = new JSONObject(); + tmp.put("name", name); + tmp.put("desc", desc); + termTable.add(tmp); + } } } } } + JSONArray organizationTable = new JSONArray(); //组织职责Table // 属性特征 属性代码KEY PALRepositoryPropertyModel Organizational = PALRepositoryPropertyCache.getPropertyByPropertyId(repositoryModel.getId(),"Organizational_role"); - String OrganizationalVal = Organizational.getPropertyValue(); - JSONObject OrganizationalObj = JSONObject.parseObject(OrganizationalVal); - if (OrganizationalObj != null && !OrganizationalObj.isEmpty()) { - JSONArray tableArr = OrganizationalObj.getJSONArray("table"); - if (tableArr != null && !tableArr.isEmpty()) { - for (Object obj : tableArr) { - JSONObject obj2 = (JSONObject) obj; - if (!"table_head".equals(obj2.getString("id"))) { - String name = obj2.getString("name"); - String desc = obj2.getString("desc"); - JSONObject tmp = new JSONObject(); - tmp.put("name", name); - tmp.put("desc", desc); - organizationTable.add(tmp); + if (Organizational != null){ + String OrganizationalVal = Organizational.getPropertyValue(); + JSONObject OrganizationalObj = JSONObject.parseObject(OrganizationalVal); + if (OrganizationalObj != null && !OrganizationalObj.isEmpty()) { + JSONArray tableArr = OrganizationalObj.getJSONArray("table"); + if (tableArr != null && !tableArr.isEmpty()) { + for (Object obj : tableArr) { + JSONObject obj2 = (JSONObject) obj; + if (!"table_head".equals(obj2.getString("id"))) { + String name = obj2.getString("name"); + String desc = obj2.getString("desc"); + JSONObject tmp = new JSONObject(); + tmp.put("name", name); + tmp.put("desc", desc); + organizationTable.add(tmp); + } } } } } + //支持文件 JSONArray supportfiles = new JSONArray(); //组织职责Table List relationList = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "support_files"); diff --git a/com.actionsoft.apps.coe.pal/manifest.xml b/com.actionsoft.apps.coe.pal/manifest.xml index e6315aa2..8940e91c 100755 --- a/com.actionsoft.apps.coe.pal/manifest.xml +++ b/com.actionsoft.apps.coe.pal/manifest.xml @@ -3,7 +3,7 @@ CoE PAL流程资产库 6.5 - 71 + 73 北京炎黄盈动科技发展有限责任公司 false diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java index 0254a842..53846eeb 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java @@ -2261,11 +2261,13 @@ public class CoeProcessLevelUtil { String sessionId = new SSOUtil().registerClientSessionNoPassword(plModel.getCreateUser(), LoginConst.DEFAULT_LANG, "localhost", LoginConst.DEVICE_PC); - String relationFileId = JSONObject.parseObject(property.getPropertyValue()).get("relationFileId").toString(); + if(JSONObject.parseObject(property.getPropertyValue())!=null){ + String relationFileId = JSONObject.parseObject(property.getPropertyValue()).get("relationFileId").toString(); + String url=SDK.getPortalAPI().getPortalUrl()+"/r/w?uuid="+relationFileId+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+sessionId+""; + String appUrl=""+inputValue+""; + attribute.put("value", appUrl); + } - String url=SDK.getPortalAPI().getPortalUrl()+"/r/w?uuid="+relationFileId+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+sessionId+""; - String appUrl=""+inputValue+""; - attribute.put("value", appUrl); }else{ attribute.put("value", inputValue); } diff --git a/com.awspaas.user.apps.coe.pal.output.bd/manifest.xml b/com.awspaas.user.apps.coe.pal.output.bd/manifest.xml index 316f188f..8a4e426e 100644 --- a/com.awspaas.user.apps.coe.pal.output.bd/manifest.xml +++ b/com.awspaas.user.apps.coe.pal.output.bd/manifest.xml @@ -3,7 +3,7 @@ 表单手册 1.0 - 4 + 5 AWSPaaS-EndUser false diff --git a/com.awspaas.user.apps.coe.pal.output.zd/manifest.xml b/com.awspaas.user.apps.coe.pal.output.zd/manifest.xml index 088b77cd..6a4a3a89 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/manifest.xml +++ b/com.awspaas.user.apps.coe.pal.output.zd/manifest.xml @@ -3,7 +3,7 @@ 制度手册 1.0 - 3 + 4 AWSPaaS-EndUser false