yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修改流程手册BUG。

Browse Source
This commit is contained in:
翟林帆 2022-07-12 13:42:51 +08:00
parent 13bbd9ecb7
commit 8e495b7d0a
6 changed files with 56 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
com.actionsoft.apps.coe.pal.output.pr/manifest.xml
View File

@ -3,7 +3,7 @@
<app xmlns="http://www.actionsoft.com.cn/app">
<name>流程手册</name>
<version>1.0</version>
<buildNo>28</buildNo>
<buildNo>29</buildNo>
<developer id="776cca9a287c8b4d63b9cad216aa3859" tablePrefix="ACT" url="http://www.actionsoft.com.cn">北京炎黄盈动科技发展有限责任公司</developer>
<productId>6636fc53728276eb3baca55938356b74</productId>
<categoryVisible>false</categoryVisible>
@ -34,8 +34,8 @@
<uninstallListener/>
<reloadable>true</reloadable>
<requires>
<require appId="com.actionsoft.apps.coe.pal" notActiveHandler="warning" res="false"/>
<require appId="com.actionsoft.apps.addons.onlinedoc" notActiveHandler="none" res="false"/>
<require appId="com.actionsoft.apps.coe.pal" notActiveHandler="warning" res="false"/>
<require appId="com.actionsoft.apps.addons.onlinedoc" notActiveHandler="none" res="false"/>
</requires>
<properties>
<property action="edit" group="参数" name="DEFAULT_REPORT_PR" title="默认使用手册模板" type="combox" isSystem="false" desc="流程建模或流程发布时生成流程手册的模板选择" ref="步骤横表:cross|步骤竖表:vertical|项目定制:project">cross</property>

72
com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java
View File

@ -192,6 +192,16 @@ public class Report1Gener {
//流程绩效
List<DesignerShapeRelationModel> 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<DesignerShapeRelationModel> relationList = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "support_files");

2
com.actionsoft.apps.coe.pal/manifest.xml
View File

@ -3,7 +3,7 @@
<app xmlns="http://www.actionsoft.com.cn/app">
<name>CoE PAL流程资产库</name>
<version>6.5</version>
<buildNo>71</buildNo>
<buildNo>73</buildNo>
<developer id="776cca9a287c8b4d63b9cad216aa3859" url="http://www.actionsoft.com.cn" tablePrefix="ACT">北京炎黄盈动科技发展有限责任公司</developer>
<productId/>
<categoryVisible>false</categoryVisible>

10
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java
View File

@ -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="<a href='"+url+"' style='color:blue' target='_blank'>"+inputValue+"</a>";
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="<a href='"+url+"' style='color:blue' target='_blank'>"+inputValue+"</a>";
attribute.put("value", appUrl);
}else{
attribute.put("value", inputValue);
}

2
com.awspaas.user.apps.coe.pal.output.bd/manifest.xml
View File

@ -3,7 +3,7 @@
<app xmlns="http://www.actionsoft.com.cn/app">
<name>表单手册</name>
<version>1.0</version>
<buildNo>4</buildNo>
<buildNo>5</buildNo>
<developer id="00000000000000000000000000000000" tablePrefix="EU" url="http://www.awspaas.com">AWSPaaS-EndUser</developer>
<categoryVisible>false</categoryVisible>
<description><![CDATA[将流程输入输出等关键要素和关联模型输出成易于阅读和打印的Word文档]]></description>

2
com.awspaas.user.apps.coe.pal.output.zd/manifest.xml
View File

@ -3,7 +3,7 @@
<app xmlns="http://www.actionsoft.com.cn/app">
<name>制度手册</name>
<version>1.0</version>
<buildNo>3</buildNo>
<buildNo>4</buildNo>
<developer id="00000000000000000000000000000000" tablePrefix="EU" url="http://www.awspaas.com">AWSPaaS-EndUser</developer>
<categoryVisible>false</categoryVisible>
<description><![CDATA[将流程输入输出等关键要素和关联模型输出成易于阅读和打印的Word文档]]></description>