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

Merge branch 'apps_dev' of https://e.coding.net/yilidev/yilipalkaifa/apps into apps_dev

Browse Source
This commit is contained in:
zhal 2022-07-25 15:45:39 +08:00
commit 2d90714d40
20 changed files with 446 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.attribute.custom.xml
View File

@ -4,27 +4,26 @@
<attribute key="auditor" title="审核人" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="审核人" isRequired="false"/> <attribute key="auditor" title="审核人" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="审核人" isRequired="false"/>
<attribute key="reviewer" title="复核人" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="复核人" isRequired="false"/> <attribute key="reviewer" title="复核人" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="复核人" isRequired="false"/>
<attribute key="approver" title="审批人" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="审批人" isRequired="false"/> <attribute key="approver" title="审批人" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="审批人" isRequired="false"/>
<attribute key="application" title="适用范围" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/> <attribute key="application" title="适用范围" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="适用范围" isRequired="false"/>
<attribute key="file_number" title="文件编码" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="文件编码" isRequired="false"/> <attribute key="file_number" title="文件编码" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="文件编码" isRequired="false"/>
<attribute key="Process_Architecture_L1" title="流程架构L1" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="22" isRequired="false"/> <attribute key="Process_Architecture_L1" title="流程架构L1" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="流程架构L1" isRequired="false"/>
<attribute key="Process_Architecture_L2" title="流程架构L2" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="流程架构l2" isRequired="false"/> <attribute key="Process_Architecture_L2" title="流程架构L2" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="流程架构L2" isRequired="false"/>
<attribute key="Process_Architecture_L3" title="流程架构L3" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="流程架构L3" isRequired="false"/> <attribute key="Process_Architecture_L3" title="流程架构L3" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="流程架构L3" isRequired="false"/>
<attribute key="Contents_and_reasons_for_revision" title="修订内容及理由" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/> <attribute key="ARIS" title="ARIS地址" type="string" value="" ref="" readonly="false" groupPath="organization" scope="%" isValid="true" desc="ARIS地址" isRequired="false"/>
<attribute key="ARIS" title="ARIS地址" type="string" value="" ref="" readonly="false" groupPath="organization" scope="%" isValid="true"/>
<attribute key="P_versions" title="版本" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="版本" isRequired="true"/> <attribute key="P_versions" title="版本" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="版本" isRequired="true"/>
<attribute key="Drafted_and_revised_by" title="拟制/修订人" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/> <attribute key="Drafted_and_revised_by" title="拟制/修订人" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="拟制/修订人" isRequired="false"/>
<attribute key="T_supplementary_articles" title="附则" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/> <attribute key="T_supplementary_articles" title="附则" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="附则" isRequired="false"/>
<attribute key="goal" title="目的" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="1" isRequired="true"/> <attribute key="goal" title="目的" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="目的" isRequired="true"/>
<attribute key="activity_number" title="活动序号" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="activity_number" title="活动序号" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="活动序号" isRequired="false"/>
<attribute key="Process_performance_metrics" title="流程绩效" type="relation" value="" ref="{&quot;method&quot;:&quot;control.kpi&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false,&quot;value&quot;:&quot;&quot;}" readonly="true" groupPath="process_model" scope="%" isValid="true"/> <attribute key="Process_performance_metrics" title="流程绩效" type="relation" value="" ref="{&quot;method&quot;:&quot;control.kpi&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="process_model" scope="%" isValid="true" desc="流程绩效" isRequired="false"/>
<attribute key="activity_description" title="活动描述" type="textarea" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="活动描述" isRequired="true"/> <attribute key="activity_description" title="活动描述" type="textarea" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="活动描述" isRequired="true"/>
<attribute key="output" title="输出" type="textarea" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="output" title="输出" type="textarea" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="输出" isRequired="false"/>
<attribute key="R_relevant_flies" title="相关文件" type="relation" value="" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="process_model" scope="%" isValid="true" desc="相关文件" isRequired="false"/> <attribute key="R_relevant_flies" title="相关文件" type="relation" value="" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="process_model" scope="%" isValid="true" desc="相关文件" isRequired="false"/>
<attribute key="support_files" title="支持文件" type="relation" value="" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="process_model" scope="%" isValid="true" desc="支持文件" isRequired="false"/> <attribute key="support_files" title="支持文件" type="relation" value="" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="process_model" scope="%" isValid="true" desc="支持文件" isRequired="false"/>
<attribute key="relevant_flies" title="相关知识" type="link" value="" desc="相关知识" isRequired="false" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/> <attribute key="relevant_flies" title="相关知识" type="link" value="" desc="相关知识" isRequired="false" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/>
<attribute key="input" title="输入" type="textarea" value="" desc="输入" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="input" title="输入" type="textarea" value="" desc="输入" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
<attribute key="relevant_demand" title="相关要求" type="relation" value="" desc="相关要求" isRequired="false" ref="{&quot;method&quot;:&quot;itsystem&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false,&quot;value&quot;:&quot;&quot;}" readonly="true" groupPath="baseAttribute" scope="*" isValid="false"/> <attribute key="relevant_demand" title="相关要求" type="relation" value="" desc="相关要求" isRequired="false" ref="{&quot;method&quot;:&quot;itsystem&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false,&quot;value&quot;:&quot;&quot;}" readonly="true" groupPath="baseAttribute" scope="*" isValid="false"/>
<attribute key="post" title="岗位" type="relation" value="" desc="岗位" isRequired="false" ref="{&quot;method&quot;:&quot;org.normal&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false,&quot;value&quot;:&quot;&quot;}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="post" title="岗位" type="relation" value="" desc="岗位" isRequired="false" ref="{&quot;method&quot;:&quot;org.normal&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>
<attribute key="role" title="角色" type="relation" value="" desc="角色" isRequired="false" ref="{&quot;method&quot;:&quot;org.normal&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="role" title="角色" type="relation" value="" desc="角色" isRequired="false" ref="{&quot;method&quot;:&quot;org.normal&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>
<attribute key="term" title="术语" type="table" value="" desc="术语" isRequired="false" ref="{&quot;firstColumn&quot;:&quot;术语&quot;,&quot;secondColumn&quot;:&quot;定义&quot;}" readonly="false" groupPath="process_model" scope="%" isValid="true"/> <attribute key="term" title="术语" type="table" value="" desc="术语" isRequired="false" ref="{&quot;firstColumn&quot;:&quot;术语&quot;,&quot;secondColumn&quot;:&quot;定义&quot;}" readonly="false" groupPath="process_model" scope="%" isValid="true"/>
<attribute key="information_systems" title="信息系统" type="relation" value="" desc="信息系统" isRequired="false" ref="{&quot;method&quot;:&quot;itsystem.normal&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="information_systems" title="信息系统" type="relation" value="" desc="信息系统" isRequired="false" ref="{&quot;method&quot;:&quot;itsystem.normal&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>
@ -35,4 +34,7 @@
<attribute key="Process_owner" title="流程责任人" type="awsorg" value="" desc="流程责任人" isRequired="false" ref="{&quot;scope&quot;:[&quot;user&quot;],&quot;multiple&quot;:false}" readonly="true" groupPath="process_model" scope="%" isValid="true"/> <attribute key="Process_owner" title="流程责任人" type="awsorg" value="" desc="流程责任人" isRequired="false" ref="{&quot;scope&quot;:[&quot;user&quot;],&quot;multiple&quot;:false}" readonly="true" groupPath="process_model" scope="%" isValid="true"/>
<attribute key="Whether_issued" title="是否发布" type="string" value="" desc="是否发布" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> <attribute key="Whether_issued" title="是否发布" type="string" value="" desc="是否发布" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="ARIS_process_name" title="ARIS流程名称" type="string" value="" desc="ARIS流程名称" isRequired="false" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/> <attribute key="ARIS_process_name" title="ARIS流程名称" type="string" value="" desc="ARIS流程名称" isRequired="false" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/>
<attribute key="lead_process" title="前置流程" type="relation" value="" desc="前置流程" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="process_model" scope="%" isValid="true"/>
<attribute key="rear_process" title="后置流程" type="relation" value="" desc="后置流程" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="process_model" scope="%" isValid="true"/>
<attribute key="Contents_and_reasons_for_revision" title="修订内容及理由" type="textarea" value="" desc="修订内容及理由" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
</attributes> </attributes>

BIN
com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.doc
View File

Binary file not shown.

4
com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.xml
View File

@ -1923,7 +1923,7 @@ jM/of07/BWuyjU4AAAvwBAAAABI0Vng=
<w:color w:val="000000"/> <w:color w:val="000000"/>
<w:sz w:val="52"/> <w:sz w:val="52"/>
</w:rPr> </w:rPr>
<w:t>流程文件</w:t> <w:t></w:t>
</w:r> </w:r>
</w:p> </w:p>
<w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000"> <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
@ -5280,8 +5280,6 @@ y7fdOgAAAABJRU5ErkJggk==
</w:r> </w:r>
</w:p> </w:p>
<#else> <#else>
<w:tbl> <w:tbl>
<w:tblPr> <w:tblPr>
<w:tblW w:w="13712" w:type="dxa"/> <w:tblW w:w="13712" w:type="dxa"/>

BIN
com.actionsoft.apps.coe.pal.output.pr/步骤竖表-流程手册2.doc
View File

Binary file not shown.

29
com.actionsoft.apps.coe.pal.output.pr/步骤竖表-流程手册2.xml
View File

@ -1948,7 +1948,7 @@ qXElbvnPjM/of07/BTwAi9oAAAvwBAAAABI0Vng=
<w:color w:val="000000"/> <w:color w:val="000000"/>
<w:sz w:val="52"/> <w:sz w:val="52"/>
</w:rPr> </w:rPr>
<w:t>流程文件</w:t> <w:t></w:t>
</w:r> </w:r>
</w:p> </w:p>
<w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000"> <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
@ -6760,8 +6760,7 @@ y7fdOgAAAABJRU5ErkJggk==
<#else> <#else>
<#list file_table as table4> <#list file_table as table4>
<w:p wsp:rsidR="003811F1" wsp:rsidRDefault="000D620D" wsp:rsidP="00692573"> <w:p wsp:rsidR="003811F1" wsp:rsidRDefault="000D620D" wsp:rsidP="00692573">
<w:pPr>
</w:pPr>
<w:hlink w:dest="${table4.link}"> <w:hlink w:dest="${table4.link}">
<w:r wsp:rsidR="00692573" wsp:rsidRPr="000D620D"> <w:r wsp:rsidR="00692573" wsp:rsidRPr="000D620D">
<w:rPr> <w:rPr>
@ -6776,25 +6775,13 @@ y7fdOgAAAABJRU5ErkJggk==
<#list repository_shape_table as table1> <#list repository_shape_table as table1>
<#list table1.shape_File_Table as table11> <#list table1.shape_File_Table as table11>
<w:p wsp:rsidR="00E54D8E" wsp:rsidRDefault="005011CF"> <w:p wsp:rsidR="00E54D8E" wsp:rsidRDefault="005011CF">
<w:pPr>
<!-- <w:pStyle w:val="p0"/>-->
<!-- <w:rPr>-->
<!-- <w:rFonts w:ascii="宋体" w:h-ansi="Calibri" w:cs="宋体"/>-->
<!-- <wx:font wx:val="宋体"/>-->
<!-- <w:color w:val="2440b3"/>-->
<!-- <w:sz w:val="22"/>-->
<!-- <w:sz-cs w:val="20"/>-->
<!-- </w:rPr>-->
</w:pPr>
<w:hlink w:dest="${table11.shape_file_link}"> <w:hlink w:dest="${table11.shape_file_link}">
<w:r wsp:rsidR="00CB55CB" wsp:rsidRPr="005011CF"> <w:r wsp:rsidR="00CB55CB" wsp:rsidRPr="005011CF">
<w:rPr> <w:rPr>
<w:rStyle w:val="a4"/> <w:rStyle w:val="a4"/>
<w:color w:val="2440b3"/> <w:color w:val="2440b3"/>
<!-- <w:rFonts w:ascii="宋体" w:h-ansi="Calibri" w:cs="宋体" w:hint="fareast"/>-->
<!-- <wx:font wx:val="宋体"/>-->
<!-- <w:sz w:val="22"/>-->
<!-- <w:sz-cs w:val="20"/>-->
</w:rPr> </w:rPr>
<w:t>${table11.shape_file_name}</w:t> <w:t>${table11.shape_file_name}</w:t>
</w:r> </w:r>
@ -6802,13 +6789,7 @@ y7fdOgAAAABJRU5ErkJggk==
</w:p> </w:p>
</#list> </#list>
</#list> </#list>
<w:p wsp:rsidR="00B739CB" wsp:rsidRDefault="00B739CB">
<w:pPr>
<w:rPr>
<w:rFonts w:hint="fareast"/>
</w:rPr>
</w:pPr>
</w:p>
</#if> </#if>
</wx:sub-section> </wx:sub-section>
<w:sectPr wsp:rsidR="00B739CB"> <w:sectPr wsp:rsidR="00B739CB">

BIN
com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar
View File

Binary file not shown.

12
com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/PublisherController.java
View File

@ -693,4 +693,16 @@ public class PublisherController {
ProcessPublishWeb publishWeb = new ProcessPublishWeb(me); ProcessPublishWeb publishWeb = new ProcessPublishWeb(me);
return publishWeb.getOrgInfo(me); return publishWeb.getOrgInfo(me);
} }
/**
* 下载日志
* @param me
* @param taskId
* @return
*/
@Mapping("com.actionsoft.apps.coe.pal.publisher_output_download")
public String downloadOutput(UserContext me, String taskId, String uuid) {
ProcessPublishWeb publishWeb = new ProcessPublishWeb(me);
return publishWeb.downloadOutput(taskId, uuid);
}
} }

6
com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishClientWeb.java
View File

@ -2892,7 +2892,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk
} }
object2.put("user", userName); object2.put("user", userName);
object2.put("departmentPath", getDeptPath(userId)); object2.put("departmentPath", getDeptPath(userId));
object2.put("publishDate", UtilDate.datetimeFormat(object.getTimestamp("date"))); object2.put("publishDate", UtilDate.datetimeFormat((Timestamp) object.getTimestamp("date")));
object2.put("publishDesc", object.getString("desc")); object2.put("publishDesc", object.getString("desc"));
} else { } else {
object2.put("user", ""); object2.put("user", "");
@ -3156,7 +3156,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk
} }
object2.put("name", palModel.getName() + "[" + intro + "]"); object2.put("name", palModel.getName() + "[" + intro + "]");
object2.put("user", userName); object2.put("user", userName);
object2.put("publishDate", UtilDate.datetimeFormat(object.getTimestamp("publishDate"))); object2.put("publishDate", UtilDate.datetimeFormat((Timestamp) object.getTimestamp("publishDate")));
object2.put("publishDesc", object.getString("publishDesc")); object2.put("publishDesc", object.getString("publishDesc"));
object2.put("isPublish", palModel.isPublish() ? "1" : "0"); object2.put("isPublish", palModel.isPublish() ? "1" : "0");
object2.put("method", palModel.getMethodId()); object2.put("method", palModel.getMethodId());
@ -3299,7 +3299,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk
object2.put("name", palModel.getName() + "[" + intro + "]"); object2.put("name", palModel.getName() + "[" + intro + "]");
object2.put("user", userName); object2.put("user", userName);
object2.put("departmentPath", getDeptPath(object.getString("userId"))); object2.put("departmentPath", getDeptPath(object.getString("userId")));
object2.put("publishDate", UtilDate.datetimeFormat(object.getTimestamp("publishDate"))); object2.put("publishDate", UtilDate.datetimeFormat((Timestamp) object.getTimestamp("publishDate")));
object2.put("publishDesc", object.getString("publishDesc")); object2.put("publishDesc", object.getString("publishDesc"));
object2.put("isPublish", palModel.isPublish() ? "1" : "0"); object2.put("isPublish", palModel.isPublish() ? "1" : "0");
object2.put("method", palModel.getMethodId()); object2.put("method", palModel.getMethodId());

183
com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java
View File

@ -1,5 +1,6 @@
package com.actionsoft.apps.coe.pal.publisher.client.web; package com.actionsoft.apps.coe.pal.publisher.client.web;
import java.io.File;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@ -19,6 +20,8 @@ import com.actionsoft.apps.coe.pal.constant.CoEConstant;
import com.actionsoft.apps.coe.pal.cooperation.cache.CooperationCache; import com.actionsoft.apps.coe.pal.cooperation.cache.CooperationCache;
import com.actionsoft.apps.coe.pal.cooperation.CoeCooperationAPIManager; import com.actionsoft.apps.coe.pal.cooperation.CoeCooperationAPIManager;
import com.actionsoft.apps.coe.pal.cooperation.model.CoeCooperationTeamModel; import com.actionsoft.apps.coe.pal.cooperation.model.CoeCooperationTeamModel;
import com.actionsoft.apps.coe.pal.log.CoEOpLogAPI;
import com.actionsoft.apps.coe.pal.log.CoEOpLogConst;
import com.actionsoft.apps.coe.pal.pal.manage.publish.PublishAPIManager; import com.actionsoft.apps.coe.pal.pal.manage.publish.PublishAPIManager;
import com.actionsoft.apps.coe.pal.pal.manage.publish.cache.PublishHistoryCache; import com.actionsoft.apps.coe.pal.pal.manage.publish.cache.PublishHistoryCache;
import com.actionsoft.apps.coe.pal.pal.manage.publish.constant.PublishConst; import com.actionsoft.apps.coe.pal.pal.manage.publish.constant.PublishConst;
@ -27,6 +30,9 @@ import com.actionsoft.apps.coe.pal.pal.manage.publish.model.PublishHistoryModel;
import com.actionsoft.apps.coe.pal.pal.manage.publish.model.PublishListHistoryModel; import com.actionsoft.apps.coe.pal.pal.manage.publish.model.PublishListHistoryModel;
import com.actionsoft.apps.coe.pal.pal.method.PALMethodManager; import com.actionsoft.apps.coe.pal.pal.method.PALMethodManager;
import com.actionsoft.apps.coe.pal.pal.method.cache.PALMethodCache; import com.actionsoft.apps.coe.pal.pal.method.cache.PALMethodCache;
import com.actionsoft.apps.coe.pal.pal.output.OutputAPIManager;
import com.actionsoft.apps.coe.pal.pal.output.dao.OutputTask;
import com.actionsoft.apps.coe.pal.pal.output.model.OutputTaskModel;
import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryQueryAPIManager; import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryQueryAPIManager;
import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache; import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache;
import com.actionsoft.apps.coe.pal.pal.repository.dao.PALRepository; import com.actionsoft.apps.coe.pal.pal.repository.dao.PALRepository;
@ -61,6 +67,8 @@ import com.actionsoft.bpms.org.cache.UserCache;
import com.actionsoft.bpms.org.model.UserModel; import com.actionsoft.bpms.org.model.UserModel;
import com.actionsoft.bpms.server.Quota; import com.actionsoft.bpms.server.Quota;
import com.actionsoft.bpms.server.UserContext; import com.actionsoft.bpms.server.UserContext;
import com.actionsoft.bpms.server.fs.DCContext;
import com.actionsoft.bpms.server.fs.dc.DCUtil;
import com.actionsoft.bpms.util.*; import com.actionsoft.bpms.util.*;
import com.actionsoft.exception.AWSException; import com.actionsoft.exception.AWSException;
import com.actionsoft.i18n.I18nRes; import com.actionsoft.i18n.I18nRes;
@ -75,7 +83,6 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.xlsx4j.sml.Row;
/** /**
* 流程发布App * 流程发布App
@ -814,7 +821,8 @@ public class ProcessPublishWeb extends ActionWeb {
JSONObject object = new JSONObject(); JSONObject object = new JSONObject();
object.put("id", model.getId()); object.put("id", model.getId());
object.put("name", model.getName()); object.put("name", model.getName());
object.put("version", model.getVersion()); object.put("version", VersionUtil.getVersionStr(model.getVersion()));
// object.put("version", model.getVersion());
ja.add(object); ja.add(object);
} }
} }
@ -1683,11 +1691,11 @@ public class ProcessPublishWeb extends ActionWeb {
newObj.put("publishFileId", newBo.getString("PUBLISHFILEID")); newObj.put("publishFileId", newBo.getString("PUBLISHFILEID"));
PALRepositoryModel model = PALRepositoryCache.getCache().get(newBo.getString("PUBLISHFILEID")); PALRepositoryModel model = PALRepositoryCache.getCache().get(newBo.getString("PUBLISHFILEID"));
if (model != null) { if (model != null) {
newObj.put("fileVersion", model.getVersion()); newObj.put("fileVersion", VersionUtil.getVersionStr(model.getVersion()));
newObj.put("methodId", model.getMethodId()); newObj.put("methodId", model.getMethodId());
newObj.put("category", model.getMethodCategory()); newObj.put("category", model.getMethodCategory());
} else { } else {
newObj.put("fileVersion", 1); newObj.put("fileVersion", "1.0");
newObj.put("methodId", "1"); newObj.put("methodId", "1");
newObj.put("category", "1"); newObj.put("category", "1");
} }
@ -1704,7 +1712,7 @@ public class ProcessPublishWeb extends ActionWeb {
JSONArray array = new JSONArray(); JSONArray array = new JSONArray();
PALRepositoryModel model = PALRepositoryCache.getCache().get(changeBo.getString("CHANGEFILEID")); PALRepositoryModel model = PALRepositoryCache.getCache().get(changeBo.getString("CHANGEFILEID"));
if (model != null) { if (model != null) {
changeObj.put("fileVersion", model.getVersion()); changeObj.put("fileVersion", VersionUtil.getVersionStr(model.getVersion()));
changeObj.put("methodId", model.getMethodId()); changeObj.put("methodId", model.getMethodId());
changeObj.put("category", model.getMethodCategory()); changeObj.put("category", model.getMethodCategory());
List<PALRepositoryModel> list2 = PALRepositoryCache.getByVersionId(wsId, model.getVersionId()); List<PALRepositoryModel> list2 = PALRepositoryCache.getByVersionId(wsId, model.getVersionId());
@ -1721,23 +1729,23 @@ public class ProcessPublishWeb extends ActionWeb {
JSONObject object = new JSONObject(); JSONObject object = new JSONObject();
object.put("text", model2.getName()); object.put("text", model2.getName());
object.put("id", model2.getId()); object.put("id", model2.getId());
object.put("version", model2.getVersion()); object.put("version", VersionUtil.getVersionStr(model2.getVersion()));
array.add(object); array.add(object);
} }
} }
} else { } else {
changeObj.put("fileVersion", 1); changeObj.put("fileVersion", "1.0");
changeObj.put("methodId", "1"); changeObj.put("methodId", "1");
changeObj.put("category", "1"); changeObj.put("category", "1");
} }
changeObj.put("targetFiles", array); changeObj.put("targetFiles", array);
PALRepositoryModel targetModel = PALRepositoryCache.getCache().get(changeBo.getString("CHANGEDFILEIDNEW")); PALRepositoryModel targetModel = PALRepositoryCache.getCache().get(changeBo.getString("CHANGEDFILEIDNEW"));
if (targetModel != null) { if (targetModel != null) {
changeObj.put("targetFileVersion", targetModel.getVersion()); changeObj.put("targetFileVersion", VersionUtil.getVersionStr(targetModel.getVersion()));
changeObj.put("targetMethodId", targetModel.getMethodId()); changeObj.put("targetMethodId", targetModel.getMethodId());
changeObj.put("targetCategory", targetModel.getMethodCategory()); changeObj.put("targetCategory", targetModel.getMethodCategory());
} else { } else {
changeObj.put("targetFileVersion", 1); changeObj.put("targetFileVersion", "1.0");
changeObj.put("targetMethodId", "1"); changeObj.put("targetMethodId", "1");
changeObj.put("targetCategory", "1"); changeObj.put("targetCategory", "1");
} }
@ -1748,11 +1756,11 @@ public class ProcessPublishWeb extends ActionWeb {
stopObj.put("stopFileId", stopBo.getString("STOPFILEID")); stopObj.put("stopFileId", stopBo.getString("STOPFILEID"));
PALRepositoryModel model = PALRepositoryCache.getCache().get(stopBo.getString("STOPFILEID")); PALRepositoryModel model = PALRepositoryCache.getCache().get(stopBo.getString("STOPFILEID"));
if (model != null) { if (model != null) {
stopObj.put("fileVersion", model.getVersion()); stopObj.put("fileVersion", VersionUtil.getVersionStr(model.getVersion()));
stopObj.put("methodId", model.getMethodId()); stopObj.put("methodId", model.getMethodId());
stopObj.put("category", model.getMethodCategory()); stopObj.put("category", model.getMethodCategory());
} else { } else {
stopObj.put("fileVersion", 1); stopObj.put("fileVersion", "1.0");
stopObj.put("methodId", "1"); stopObj.put("methodId", "1");
stopObj.put("category", "1"); stopObj.put("category", "1");
} }
@ -1999,6 +2007,12 @@ public class ProcessPublishWeb extends ActionWeb {
if (!SDK.getAppAPI().isActive("com.actionsoft.apps.coe.pal.output.pr")) { if (!SDK.getAppAPI().isActive("com.actionsoft.apps.coe.pal.output.pr")) {
return ResponseObject.newErrResponse("流程手册未安装或已暂停").toString(); return ResponseObject.newErrResponse("流程手册未安装或已暂停").toString();
} }
if (!SDK.getAppAPI().isActive("com.awspaas.user.apps.coe.pal.output.bd")) {
return ResponseObject.newErrResponse("表单手册未安装或已暂停").toString();
}
if (!SDK.getAppAPI().isActive("com.awspaas.user.apps.coe.pal.output.zd")) {
return ResponseObject.newErrResponse("制度手册未安装或已暂停").toString();
}
ResponseObject ro = ResponseObject.newOkResponse(); ResponseObject ro = ResponseObject.newOkResponse();
// 校验 // 校验
PALRepositoryModel model = PALRepositoryCache.getCache().get(uuid); PALRepositoryModel model = PALRepositoryCache.getCache().get(uuid);
@ -2006,7 +2020,11 @@ public class ProcessPublishWeb extends ActionWeb {
throw new AWSException("没有找到文件:" + uuid); throw new AWSException("没有找到文件:" + uuid);
} }
String taskId = ""; String taskId = "";
if ("process".equals(model.getMethodCategory()) && !"process.evc".equals(model.getMethodId()) && !"default".equals(model.getMethodId())) { if (("process".equals(model.getMethodCategory()) || "data".equals(model.getMethodCategory()) || "control".equals(model.getMethodCategory())) && !"default".equals(model.getMethodId())) {
} else {
throw new AWSException("文件不支持创建流程手册:" + uuid);
}
if ("process".equals(model.getMethodCategory())) {
taskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportPr(wsId, _uc.getUID(), teamId, uuid); taskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportPr(wsId, _uc.getUID(), teamId, uuid);
JSONObject object = JSONObject.parseObject(taskId); JSONObject object = JSONObject.parseObject(taskId);
if ("ok".equals(object.getString("result"))) { if ("ok".equals(object.getString("result"))) {
@ -2014,8 +2032,22 @@ public class ProcessPublishWeb extends ActionWeb {
} else { } else {
throw new AWSException("创建流程手册失败:" + uuid); throw new AWSException("创建流程手册失败:" + uuid);
} }
} else if ("data".equals(model.getMethodCategory())) {
taskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportBd(wsId, _uc.getUID(), teamId, uuid);
JSONObject object = JSONObject.parseObject(taskId);
if ("ok".equals(object.getString("result"))) {
taskId = object.getJSONObject("data").getString("taskId");
} else { } else {
throw new AWSException("文件不支持创建流程手册:" + uuid); throw new AWSException("创建流程手册失败:" + uuid);
}
} else if ("control".equals(model.getMethodCategory())) {
taskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportZd(wsId, _uc.getUID(), teamId, uuid);
JSONObject object = JSONObject.parseObject(taskId);
if ("ok".equals(object.getString("result"))) {
taskId = object.getJSONObject("data").getString("taskId");
} else {
throw new AWSException("创建流程手册失败:" + uuid);
}
} }
ro.put("taskId", taskId); ro.put("taskId", taskId);
return ro.toString(); return ro.toString();
@ -2044,7 +2076,8 @@ public class ProcessPublishWeb extends ActionWeb {
JSONObject object = new JSONObject(); JSONObject object = new JSONObject();
object.put("id", model.getId()); object.put("id", model.getId());
object.put("text", model.getName()); object.put("text", model.getName());
object.put("version", model.getVersion()); object.put("version", VersionUtil.getVersionStr(model.getVersion()));
// object.put("version", model.getVersion());
array.add(object); array.add(object);
} }
} }
@ -2297,7 +2330,8 @@ public class ProcessPublishWeb extends ActionWeb {
obj.put("type", type); obj.put("type", type);
obj.put("id", m.getId()); obj.put("id", m.getId());
obj.put("name", m.getName()); obj.put("name", m.getName());
obj.put("version", m.getVersion()); obj.put("version", VersionUtil.getVersionStr(m.getVersion()));
// obj.put("version", m.getVersion());
} }
} }
} }
@ -2360,11 +2394,11 @@ public class ProcessPublishWeb extends ActionWeb {
obj.put("processNumber", newBo.getString("PROCESS_NUMBER")); obj.put("processNumber", newBo.getString("PROCESS_NUMBER"));
PALRepositoryModel model = PALRepositoryCache.getCache().get(newBo.getString("PUBLISHFILEID")); PALRepositoryModel model = PALRepositoryCache.getCache().get(newBo.getString("PUBLISHFILEID"));
if (model != null) { if (model != null) {
obj.put("fileVersion", model.getVersion()); obj.put("fileVersion", VersionUtil.getVersionStr(model.getVersion()));
obj.put("methodId", model.getMethodId()); obj.put("methodId", model.getMethodId());
obj.put("category", model.getMethodCategory()); obj.put("category", model.getMethodCategory());
} else { } else {
obj.put("fileVersion", 1); obj.put("fileVersion", "1.0");
obj.put("methodId", "1"); obj.put("methodId", "1");
obj.put("category", "1"); obj.put("category", "1");
} }
@ -2388,7 +2422,7 @@ public class ProcessPublishWeb extends ActionWeb {
JSONArray array = new JSONArray(); JSONArray array = new JSONArray();
PALRepositoryModel model = PALRepositoryCache.getCache().get(changeBo.getString("CHANGEFILEID")); PALRepositoryModel model = PALRepositoryCache.getCache().get(changeBo.getString("CHANGEFILEID"));
if (model != null) { if (model != null) {
obj.put("fileVersion", model.getVersion()); obj.put("fileVersion", VersionUtil.getVersionStr(model.getVersion()));
obj.put("methodId", model.getMethodId()); obj.put("methodId", model.getMethodId());
obj.put("category", model.getMethodCategory()); obj.put("category", model.getMethodCategory());
List<PALRepositoryModel> list2 = PALRepositoryCache.getByVersionId(wsId, model.getVersionId()); List<PALRepositoryModel> list2 = PALRepositoryCache.getByVersionId(wsId, model.getVersionId());
@ -2405,23 +2439,23 @@ public class ProcessPublishWeb extends ActionWeb {
JSONObject object = new JSONObject(); JSONObject object = new JSONObject();
object.put("text", model2.getName()); object.put("text", model2.getName());
object.put("id", model2.getId()); object.put("id", model2.getId());
object.put("version", model2.getVersion()); object.put("version", VersionUtil.getVersionStr(model2.getVersion()));
array.add(object); array.add(object);
} }
} }
} else { } else {
obj.put("fileVersion", 1); obj.put("fileVersion", "1.0");
obj.put("methodId", "1"); obj.put("methodId", "1");
obj.put("category", "1"); obj.put("category", "1");
} }
obj.put("targetFiles", array); obj.put("targetFiles", array);
PALRepositoryModel targetModel = PALRepositoryCache.getCache().get(changeBo.getString("CHANGEDFILEIDNEW")); PALRepositoryModel targetModel = PALRepositoryCache.getCache().get(changeBo.getString("CHANGEDFILEIDNEW"));
if (targetModel != null) { if (targetModel != null) {
obj.put("targetFileVersion", targetModel.getVersion()); obj.put("targetFileVersion", VersionUtil.getVersionStr(targetModel.getVersion()));
obj.put("targetMethodId", targetModel.getMethodId()); obj.put("targetMethodId", targetModel.getMethodId());
obj.put("targetCategory", targetModel.getMethodCategory()); obj.put("targetCategory", targetModel.getMethodCategory());
} else { } else {
obj.put("targetFileVersion", 1); obj.put("targetFileVersion", "1.0");
obj.put("targetMethodId", "1"); obj.put("targetMethodId", "1");
obj.put("targetCategory", "1"); obj.put("targetCategory", "1");
} }
@ -2439,11 +2473,11 @@ public class ProcessPublishWeb extends ActionWeb {
obj.put("stopFileId", stopBo.getString("STOPFILEID")); obj.put("stopFileId", stopBo.getString("STOPFILEID"));
PALRepositoryModel model = PALRepositoryCache.getCache().get(stopBo.getString("STOPFILEID")); PALRepositoryModel model = PALRepositoryCache.getCache().get(stopBo.getString("STOPFILEID"));
if (model != null) { if (model != null) {
obj.put("fileVersion", model.getVersion()); obj.put("fileVersion", VersionUtil.getVersionStr(model.getVersion()));
obj.put("methodId", model.getMethodId()); obj.put("methodId", model.getMethodId());
obj.put("category", model.getMethodCategory()); obj.put("category", model.getMethodCategory());
} else { } else {
obj.put("fileVersion", 1); obj.put("fileVersion", "1.0");
obj.put("methodId", "1"); obj.put("methodId", "1");
obj.put("category", "1"); obj.put("category", "1");
} }
@ -2473,9 +2507,16 @@ public class ProcessPublishWeb extends ActionWeb {
* @return * @return
*/ */
public String createOutputPrReports(String wsId, String teamId, String uuids) { public String createOutputPrReports(String wsId, String teamId, String uuids) {
// 校验流程手册是否安装并启动
if (!SDK.getAppAPI().isActive("com.actionsoft.apps.coe.pal.output.pr")) { if (!SDK.getAppAPI().isActive("com.actionsoft.apps.coe.pal.output.pr")) {
return ResponseObject.newErrResponse("流程手册未安装或已暂停").toString(); return ResponseObject.newErrResponse("流程手册未安装或已暂停").toString();
} }
if (!SDK.getAppAPI().isActive("com.awspaas.user.apps.coe.pal.output.bd")) {
return ResponseObject.newErrResponse("表单手册未安装或已暂停").toString();
}
if (!SDK.getAppAPI().isActive("com.awspaas.user.apps.coe.pal.output.zd")) {
return ResponseObject.newErrResponse("制度手册未安装或已暂停").toString();
}
ResponseObject ro = ResponseObject.newOkResponse(); ResponseObject ro = ResponseObject.newOkResponse();
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
JSONArray array = JSONArray.parseArray(uuids); JSONArray array = JSONArray.parseArray(uuids);
@ -2487,7 +2528,7 @@ public class ProcessPublishWeb extends ActionWeb {
throw new AWSException("没有找到文件:" + uuid); throw new AWSException("没有找到文件:" + uuid);
} }
String taskId = ""; String taskId = "";
if ("process".equals(model.getMethodCategory()) && !"process.evc".equals(model.getMethodId()) && !"default".equals(model.getMethodId())) { if ("process".equals(model.getMethodCategory())) {
taskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportPr(wsId, _uc.getUID(), teamId, uuid); taskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportPr(wsId, _uc.getUID(), teamId, uuid);
JSONObject object = JSONObject.parseObject(taskId); JSONObject object = JSONObject.parseObject(taskId);
if ("ok".equals(object.getString("result"))) { if ("ok".equals(object.getString("result"))) {
@ -2495,8 +2536,22 @@ public class ProcessPublishWeb extends ActionWeb {
} else { } else {
throw new AWSException("创建流程手册失败:" + uuid); throw new AWSException("创建流程手册失败:" + uuid);
} }
} else if ("data".equals(model.getMethodCategory())) {
taskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportBd(wsId, _uc.getUID(), teamId, uuid);
JSONObject object = JSONObject.parseObject(taskId);
if ("ok".equals(object.getString("result"))) {
taskId = object.getJSONObject("data").getString("taskId");
} else { } else {
throw new AWSException("文件不支持创建流程手册:" + uuid); throw new AWSException("创建流程手册失败:" + uuid);
}
} else if ("control".equals(model.getMethodCategory())) {
taskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportZd(wsId, _uc.getUID(), teamId, uuid);
JSONObject object = JSONObject.parseObject(taskId);
if ("ok".equals(object.getString("result"))) {
taskId = object.getJSONObject("data").getString("taskId");
} else {
throw new AWSException("创建流程手册失败:" + uuid);
}
} }
result.put(uuid, UtilString.isEmpty(taskId) ? "" : taskId); result.put(uuid, UtilString.isEmpty(taskId) ? "" : taskId);
} }
@ -2527,10 +2582,11 @@ public class ProcessPublishWeb extends ActionWeb {
object.put("category", model.getMethodCategory()); object.put("category", model.getMethodCategory());
object.put("methodId", model.getMethodId()); object.put("methodId", model.getMethodId());
object.put("changeFileName", model.getName()); object.put("changeFileName", model.getName());
object.put("fileVersion", model.getVersion()); object.put("fileVersion", VersionUtil.getVersionStr(model.getVersion()));
// 查询未发布版本 // 查询未发布版本
List<PALRepositoryModel> models = PALRepositoryCache.getByVersionId(wsId, model.getVersionId()); List<PALRepositoryModel> models = PALRepositoryCache.getByVersionId(wsId, model.getVersionId());
if (models.size() > 0) { if (models.size() > 0) {
models.sort((m1, m2) -> {return m2.getVersion() > m1.getVersion() ? 1 : -1;});
for (PALRepositoryModel model2 : models) { for (PALRepositoryModel model2 : models) {
if (!model2.isPublish() && !model2.getId().equals(model.getId())) { if (!model2.isPublish() && !model2.getId().equals(model.getId())) {
String id = model2.getId(); String id = model2.getId();
@ -2539,26 +2595,34 @@ public class ProcessPublishWeb extends ActionWeb {
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("id", id); obj.put("id", id);
obj.put("text", text); obj.put("text", text);
obj.put("version", version); obj.put("version", VersionUtil.getVersionStr(version));
object.getJSONArray("targetFiles").add(obj); object.getJSONArray("targetFiles").add(obj);
} }
} }
} }
// 生成流程手册 // 生成流程手册
if (object.getJSONArray("targetFiles").size() > 0) { if (object.getJSONArray("targetFiles").size() > 0) {
if ("process".equals(model.getMethodCategory()) && !"process.evc".equals(model.getMethodId()) && !"default".equals(model.getMethodId())) {
if (("process".equals(model.getMethodCategory()) || "data".equals(model.getMethodCategory()) || "control".equals(model.getMethodCategory())) && !"default".equals(model.getMethodId())) {
String id = object.getJSONArray("targetFiles").getJSONObject(0).getString("id"); String id = object.getJSONArray("targetFiles").getJSONObject(0).getString("id");
PALRepositoryModel model2 = PALRepositoryCache.getCache().get(id); PALRepositoryModel model2 = PALRepositoryCache.getCache().get(id);
object.put("changedFileIdNew", model2.getId()); object.put("changedFileIdNew", model2.getId());
object.put("changedFileNameNew", model2.getName()); object.put("changedFileNameNew", model2.getName());
object.put("targetFileVersion", model2.getVersion()); object.put("targetFileVersion", VersionUtil.getVersionStr(model2.getVersion()));
object.put("targetMethodId", model2.getMethodId()); object.put("targetMethodId", model2.getMethodId());
object.put("targetCategory", model2.getMethodCategory()); object.put("targetCategory", model2.getMethodCategory());
String taskId = ""; String taskId = "";
if ("submit_create".equals(createTime)) { if ("submit_create".equals(createTime)) {
taskId = "submit_create"; taskId = "submit_create";
} else { } else {
String category = model2.getMethodCategory();
if ("process".equals(category)) {
taskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportPr(wsId, _uc.getUID(), teamId, model2.getId()); taskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportPr(wsId, _uc.getUID(), teamId, model2.getId());
} else if ("data".equals(category)) {
taskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportBd(wsId, _uc.getUID(), teamId, model2.getId());
} else if ("control".equals(category)) {
taskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportZd(wsId, _uc.getUID(), teamId, model2.getId());
}
JSONObject object2 = JSONObject.parseObject(taskId); JSONObject object2 = JSONObject.parseObject(taskId);
if ("ok".equals(object2.getString("result"))) { if ("ok".equals(object2.getString("result"))) {
taskId = object2.getJSONObject("data").getString("taskId"); taskId = object2.getJSONObject("data").getString("taskId");
@ -2769,7 +2833,7 @@ public class ProcessPublishWeb extends ActionWeb {
obj.put("type", "new"); obj.put("type", "new");
obj.put("id", model.getId()); obj.put("id", model.getId());
obj.put("name", model.getName()); obj.put("name", model.getName());
obj.put("version", model.getVersion()); obj.put("version", VersionUtil.getVersionStr(model.getVersion()));
array.add(obj); array.add(obj);
} }
} }
@ -2789,7 +2853,7 @@ public class ProcessPublishWeb extends ActionWeb {
obj.put("type", "change"); obj.put("type", "change");
obj.put("id", model.getId()); obj.put("id", model.getId());
obj.put("name", model.getName()); obj.put("name", model.getName());
obj.put("version", model.getVersion()); obj.put("version", VersionUtil.getVersionStr(model.getVersion()));
array.add(obj); array.add(obj);
} }
} }
@ -2809,7 +2873,7 @@ public class ProcessPublishWeb extends ActionWeb {
obj.put("type", "stop"); obj.put("type", "stop");
obj.put("id", model.getId()); obj.put("id", model.getId());
obj.put("name", model.getName()); obj.put("name", model.getName());
obj.put("version", model.getVersion()); obj.put("version", VersionUtil.getVersionStr(model.getVersion()));
array.add(obj); array.add(obj);
} }
} }
@ -3147,4 +3211,57 @@ public class ProcessPublishWeb extends ActionWeb {
ro.put("orgcode", code); ro.put("orgcode", code);
return ro.toString(); return ro.toString();
} }
/**
* 下载手册
*
* @param taskId
* @param uuid
* @return
*/
public String downloadOutput(String taskId, String uuid) {
PALRepositoryModel plModel = PALRepositoryCache.getCache().get(uuid);
if (plModel == null) {
return ResponseObject.newErrResponse("下载失败，模型不存在").toString();
}
String category = plModel.getMethodCategory();
String outputAppId = "process".equals(category) ? "com.actionsoft.apps.coe.pal.output.pr" :
"data".equals(category) ? "com.awspaas.user.apps.coe.pal.output.bd" :
"control".equals(category) ? "com.awspaas.user.apps.coe.pal.output.zd" : "";
if (UtilString.isEmpty(outputAppId)) {
return ResponseObject.newErrResponse("下载失败，模型分类不符").toString();
}
OutputTaskModel model = new OutputTask().getTaskReportById(taskId);
ResponseObject ro = ResponseObject.newOkResponse();
JSONObject json = new JSONObject();
if (model != null) {
String taskName = model.getTaskName();
try {
String url = "";
UtilFile file = OutputAPIManager.getInstance().getFilePath(model.getWsId(), taskId, model.getProfileId());
if (file.exists()) {
DCContext dcContext = null;
DCUtil.getInstance();
dcContext = DCUtil.createTempFileContext(outputAppId, "output", taskId, "zip");
dcContext.setFileName(taskName+ ".zip");
File ff = new File(dcContext.getFilePath());
UtilFile.zipCompressExcludeName(file.getPath(), ff, "log,**/config.txt");
dcContext.setSession(_uc);
// 操作行为日志记录
if (SDK.getAppAPI().getPropertyBooleanValue(CoEConstant.APP_ID, "IS_RECORD_OP_LOG", false)) {
CoEOpLogAPI.auditOkOp(_uc, CoEOpLogConst.MODULE_CATEGORY_APPCENTER, CoEOpLogConst.OP_DOWNLOAD, CoEOpLogConst.INFO_OUTPUT_DOWNLOAD);
}
url = dcContext.getDownloadURL();
}
json.put("url", url);
ro.setData(json);
return ro.toString();
} catch (Exception e) {
ro = ResponseObject.newErrResponse("下载失败，错误详情" + e.getMessage());
e.printStackTrace();
return ro.toString();
}
}
return ResponseObject.newErrResponse("下载失败，手册不存在").toString();
}
} }

4
com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/action.xml
View File

@ -464,4 +464,8 @@
<cmd-bean name="com.actionsoft.apps.coe.pal.publisher_getOrgInfo"> <cmd-bean name="com.actionsoft.apps.coe.pal.publisher_getOrgInfo">
</cmd-bean> </cmd-bean>
<cmd-bean name="com.actionsoft.apps.coe.pal.publisher_output_download">
<param name="taskId"/>
<param name="uuid"/>
</cmd-bean>
</aws-actions> </aws-actions>

115
com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js
View File

@ -501,6 +501,7 @@ function queryapprove(){
} }
//by bzp //by bzp
function showlist(data, type, pageNumber, start){ function showlist(data, type, pageNumber, start){
debugger;
var tableTdCss = 'style="padding-top: 0;padding-bottom: 0;"'; var tableTdCss = 'style="padding-top: 0;padding-bottom: 0;"';
if (type == 'new') { if (type == 'new') {
$('#new_check_all').check("option", "checked", false); $('#new_check_all').check("option", "checked", false);
@ -512,8 +513,9 @@ function showlist(data, type, pageNumber, start){
for (var i = 0, s = start; i < pageLimit; i++, s++) { for (var i = 0, s = start; i < pageLimit; i++, s++) {
var curr; var curr;
if ((curr = data[s - 1]) != undefined) { if ((curr = data[s - 1]) != undefined) {
var fileName = curr.publishFileName + ' V' + curr.fileVersion + '.0'; var fileName = curr.publishFileName + ' V' + curr.fileVersion;
var reportName = '<a href="javascript:void(0);" onclick="openReportFile(\'' + curr.taskId + '\')">' + fileName + "-流程手册" + '</a>'; var outputName = (curr.category == 'process' ? '流程' : curr.category == 'data' ? '表单' : curr.category == 'control' ? '制度' : '') + '手册';
var reportName = '<a href="javascript:void(0);" onclick="openReportFile(\'' + curr.taskId + '\')">' + fileName + "-" + outputName + '</a><span id="download_output_' + curr.publishFileId + '" style="cursor: pointer;" onclick="downloadReport(\'' + curr.publishFileId + '\',\'' + curr.taskId + '\')"><i class="awsui-iconfont" style="font-size: 12px;">&#xe653;</i></span>';
var quickCreate = "<a href='javascript:void(0);' onclick='quickCreateReport(" + JSON.stringify(curr) + ", $(this), \"new\")'>立即创建</a>"; var quickCreate = "<a href='javascript:void(0);' onclick='quickCreateReport(" + JSON.stringify(curr) + ", $(this), \"new\")'>立即创建</a>";
var processNumber = ''; var processNumber = '';
if(curr.processNumber != undefined){ if(curr.processNumber != undefined){
@ -540,6 +542,7 @@ function showlist(data, type, pageNumber, start){
$("#publish_new_tbody .awsui-checkbox").check(); $("#publish_new_tbody .awsui-checkbox").check();
} }
if (type == 'change') { if (type == 'change') {
var createButtonObj = {};
$('#change_check_all').check("option", "checked", false); $('#change_check_all').check("option", "checked", false);
if (data.length > pageLimit) {// 显示分页 if (data.length > pageLimit) {// 显示分页
$('#change_pagination').show(); $('#change_pagination').show();
@ -548,20 +551,24 @@ function showlist(data, type, pageNumber, start){
var html = ''; var html = '';
var tempSelect = []; var tempSelect = [];
for (var i = 0, s = start; i < pageLimit; i++, s++) { for (var i = 0, s = start; i < pageLimit; i++, s++) {
debugger;
var curr; var curr;
if ((curr = data[s - 1]) != undefined) { if ((curr = data[s - 1]) != undefined) {
var sourceFileName = curr.changeFileName + ' V' + curr.fileVersion + '.0'; var sourceFileName = curr.changeFileName + ' V' + curr.fileVersion;
// 变更目标文件处理 // 变更目标文件处理
var targetFileName = ""; var targetFileName = "";
if (curr.changedFileNameNew != undefined && curr.changedFileNameNew != '') { if (curr.changedFileNameNew != undefined && curr.changedFileNameNew != '') {
targetFileName = curr.changedFileNameNew + ' V' + curr.targetFileVersion + '.0'; targetFileName = curr.changedFileNameNew + ' V' + curr.targetFileVersion;
} }
var targetId = ""; var targetId = "";
if (curr.changedFileIdNew != undefined && curr.changedFileIdNew != '') { if (curr.changedFileIdNew != undefined && curr.changedFileIdNew != '') {
targetId = curr.changedFileIdNew; targetId = curr.changedFileIdNew;
} }
var reportName = '<a href="javascript:void(0);" onclick="openReportFile(\'' + curr.taskId + '\')">' + targetFileName + "-流程手册" + '</a>'; debugger;
var outputName = (curr.category == 'process' ? '流程' : curr.category == 'data' ? '表单' : curr.category == 'control' ? '制度' : '') + '手册';
var reportName = '<a href="javascript:void(0);" onclick="openReportFile(\'' + curr.taskId + '\')">' + targetFileName + "-" + outputName + '</a><span id="download_output_' + curr.changeFileId + '" style="cursor: pointer;" onclick="downloadReport(\'' + curr.changeFileId + '\',\'' + curr.taskId + '\')"><i class="awsui-iconfont" style="font-size: 12px;">&#xe653;</i></span>';
var quickCreate = "<a href='javascript:void(0);' onclick='quickCreateReport(" + JSON.stringify(curr) + ", $(this), \"change\")'>立即创建</a>"; var quickCreate = "<a href='javascript:void(0);' onclick='quickCreateReport(" + JSON.stringify(curr) + ", $(this), \"change\")'>立即创建</a>";
createButtonObj[curr.changeFileId] = quickCreate;
reportName = (curr.taskId == undefined || curr.taskId == '') ? '无' : curr.taskId == 'submit_create' ? quickCreate : reportName; reportName = (curr.taskId == undefined || curr.taskId == '') ? '无' : curr.taskId == 'submit_create' ? quickCreate : reportName;
// 三员管理，taskId为change标识未创建手册 // 三员管理，taskId为change标识未创建手册
@ -587,7 +594,7 @@ function showlist(data, type, pageNumber, start){
var targetFiles = $.extend(true, [], curr.targetFiles); var targetFiles = $.extend(true, [], curr.targetFiles);
for (var j = 0; j < targetFiles.length; j++) { for (var j = 0; j < targetFiles.length; j++) {
var temp = targetFiles[j]; var temp = targetFiles[j];
var name = temp.text + ' V' + temp.version + '.0'; var name = temp.text + ' V' + temp.version;
var obj = {id:temp.id, text:name, name:temp.text, version:temp.version}; var obj = {id:temp.id, text:name, name:temp.text, version:temp.version};
opt1.data.push(obj); opt1.data.push(obj);
if (targetId == temp.id) { if (targetId == temp.id) {
@ -601,6 +608,7 @@ function showlist(data, type, pageNumber, start){
tempObj.selectId = 'change_' + curr.changeFileId; tempObj.selectId = 'change_' + curr.changeFileId;
tempObj.taskId = curr.taskId; tempObj.taskId = curr.taskId;
tempObj.id = curr.changeFileId; tempObj.id = curr.changeFileId;
tempObj.category = curr.category;
tempSelect.push(tempObj); tempSelect.push(tempObj);
} }
} }
@ -616,11 +624,13 @@ function showlist(data, type, pageNumber, start){
if (tempObj.taskId != undefined && tempObj.taskId != '') { if (tempObj.taskId != undefined && tempObj.taskId != '') {
// 三员管理，taskId为change标识未创建手册 // 三员管理，taskId为change标识未创建手册
if (tempObj.taskId == 'submit_create' || tempObj.taskId == 'change') { if (tempObj.taskId == 'submit_create' || tempObj.taskId == 'change') {
$('#report_' + tempObj.id).html(quickCreate); // $('#report_' + tempObj.id).html(quickCreate);
$('#report_' + tempObj.id).html(createButtonObj[tempObj.id]);
} else { } else {
for (var m = 0; m < tempObj.opt.data.length; m++) { for (var m = 0; m < tempObj.opt.data.length; m++) {
if (tempObj.opt.data[m].id == tempObj.targetId) { if (tempObj.opt.data[m].id == tempObj.targetId) {
var targetFileName2 = tempObj.opt.data[m].name + ' V' + tempObj.opt.data[m].version + '.0' + '-流程手册'; var outputName = (tempObj.category == 'process' ? '流程' : tempObj.category == 'data' ? '表单' : tempObj.category == 'control' ? '制度' : '') + '手册';
var targetFileName2 = tempObj.opt.data[m].name + ' V' + tempObj.opt.data[m].version + '-' + outputName + '</a><span id="download_output_' + tempObj.targetId + '" style="cursor: pointer;" onclick="downloadReport(\'' + tempObj.targetId + '\',\'' + tempObj.taskId + '\')"><i class="awsui-iconfont" style="font-size: 12px;">&#xe653;</i></span>';
$('#report_' + tempObj.id).html('<a href="javascript:void(0);" onclick="openReportFile(\'' + tempObj.taskId + '\')">' + targetFileName2 + '</a>'); $('#report_' + tempObj.id).html('<a href="javascript:void(0);" onclick="openReportFile(\'' + tempObj.taskId + '\')">' + targetFileName2 + '</a>');
break; break;
} }
@ -652,7 +662,7 @@ function showlist(data, type, pageNumber, start){
for (var i = 0, s = start; i < pageLimit; i++, s++) { for (var i = 0, s = start; i < pageLimit; i++, s++) {
var curr; var curr;
if ((curr = data[s - 1]) != undefined) { if ((curr = data[s - 1]) != undefined) {
var fileName = curr.stopFileName + ' V' + curr.fileVersion + '.0'; var fileName = curr.stopFileName + ' V' + curr.fileVersion;
var reportName = '<a href="javascript:void(0);" onclick="openReportFile(\'' + curr.taskId + '\')">' + fileName + "-流程手册" + '</a>'; var reportName = '<a href="javascript:void(0);" onclick="openReportFile(\'' + curr.taskId + '\')">' + fileName + "-流程手册" + '</a>';
reportName = (curr.taskId == undefined || curr.taskId == '') ? '无' : reportName; reportName = (curr.taskId == undefined || curr.taskId == '') ? '无' : reportName;
var checkboxPerm = editPerm ? '' : 'disabled="disabled"'; var checkboxPerm = editPerm ? '' : 'disabled="disabled"';
@ -782,6 +792,7 @@ function addProcess(type) {
return; return;
} }
disabledButton(); disabledButton();
debugger;
setTimeout(function() { setTimeout(function() {
// 获取说明内容 // 获取说明内容
var desc = $('#publisher_dialog_desc').val(); var desc = $('#publisher_dialog_desc').val();
@ -888,13 +899,7 @@ function initChangedData(changeFileId) {
// 获取流程手册 // 获取流程手册
var selectedTaskId = ""; var selectedTaskId = "";
selectedTaskId = createReport(changeTemp[i].category, changeTemp[i].methodId, selectedId, selectedTaskId); selectedTaskId = createReport(changeTemp[i].category, changeTemp[i].methodId, selectedId, selectedTaskId);
// 更新界面手册
if (selectedTaskId != '') {
var targetFileName2 = changeTemp[i].targetFiles[j].text + ' V' + changeTemp[i].targetFiles[j].version + '.0' + '-流程手册';
$('#report_' + changeFileId).html('<a href="javascript:void(0);" onclick="openReportFile(\'' + selectedTaskId + '\')">' + targetFileName2 + '</a>');
} else {
$('#report_' + changeFileId).html('无');
}
// 更新数据 // 更新数据
changeTemp[i].changedFileIdNew = selectedId; changeTemp[i].changedFileIdNew = selectedId;
changeTemp[i].changedFileNameNew = changeTemp[i].targetFiles[j].text; changeTemp[i].changedFileNameNew = changeTemp[i].targetFiles[j].text;
@ -902,6 +907,17 @@ function initChangedData(changeFileId) {
changeTemp[i].targetFileVersion = changeTemp[i].targetFiles[j].version; changeTemp[i].targetFileVersion = changeTemp[i].targetFiles[j].version;
changeTemp[i].targetMethodId = changeTemp[i].methodId; changeTemp[i].targetMethodId = changeTemp[i].methodId;
changeTemp[i].targetCategory = changeTemp[i].category; changeTemp[i].targetCategory = changeTemp[i].category;
// 更新界面手册
if (selectedTaskId != '') {
var outputName = (changeTemp[i].category == 'process' ? '流程' : changeTemp[i].category == 'data' ? '表单' : changeTemp[i].category == 'control' ? '制度' : '') + '手册';
var targetFileName2 = changeTemp[i].targetFiles[j].text + ' V' + changeTemp[i].targetFiles[j].version + '-' + outputName + '</a><span id="download_output_' + changeTemp[i].changeFileId + '" style="cursor: pointer;" onclick="downloadReport(\'' + changeTemp[i].changeFileId + '\',\'' + changeTemp[i].taskId + '\')"><i class="awsui-iconfont" style="font-size: 12px;">&#xe653;</i></span>';
$('#report_' + changeFileId).html('<a href="javascript:void(0);" onclick="openReportFile(\'' + selectedTaskId + '\')">' + targetFileName2 + '</a>');
} else {
$('#report_' + changeFileId).html('无');
}
break; break;
} }
} }
@ -1259,7 +1275,8 @@ function queryBatchReport(data) {
// 创建流程手册 // 创建流程手册
function createReport(category, method, uuid, taskId) { function createReport(category, method, uuid, taskId) {
if (category == 'process' && method != "process.evc" && method != 'default') { debugger;
if ((category == 'process' || category == 'control' || category == 'data') && method != 'default') {
var param = { var param = {
sid : sid, sid : sid,
cmd : "com.actionsoft.apps.coe.pal.publisher_output_pr_report_create", cmd : "com.actionsoft.apps.coe.pal.publisher_output_pr_report_create",
@ -1279,6 +1296,8 @@ function createReport(category, method, uuid, taskId) {
} }
} }
}); });
} else {
$.simpleAlert('不支持创建手册');
} }
return taskId; return taskId;
} }
@ -1288,7 +1307,7 @@ function createBatchReport(data, createTime) {
var ids = []; var ids = [];
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
var temp = data[i]; var temp = data[i];
if (temp.category == 'process' && temp.methodId != "process.evc" && temp.methodId != 'default') { if ((temp.category == 'process' || temp.category == 'control' || temp.category == 'data') && temp.methodId != 'default') {
ids.push(temp.publishFileId); ids.push(temp.publishFileId);
} }
} }
@ -1352,14 +1371,22 @@ function getVersionsAndCreateReport(data, createTime) {
return data; return data;
} }
// 获取手册专属名称
function getOutputName(category) {
return (category == 'process' ? '流程' : category == 'data' ? '表单' : category == 'control' ? '制度' : '') + '手册';
}
//单个流程立即创建流程手册 //单个流程立即创建流程手册
function quickCreateReport(obj, object, type) { function quickCreateReport(obj, object, type) {
debugger;
var taskId; var taskId;
var category = obj.category; var category = obj.category;
var method = obj.methodId; var method = obj.methodId;
var uuid = obj.id === undefined ? obj.publishFileId: obj.id; var uuid = '';
if (isHighSecurity){ if (type == 'new') {
uuid = uuid == undefined ? obj.changedFileIdNew : uuid; uuid = obj.publishFileId;
} else if (type == 'change') {
uuid = obj.changedFileIdNew;
} }
$.simpleAlert("正在创建", "loading"); $.simpleAlert("正在创建", "loading");
taskId = createReport(category, method, uuid, taskId); taskId = createReport(category, method, uuid, taskId);
@ -1371,32 +1398,34 @@ function quickCreateReport(obj, object, type) {
if(isHighSecurity){ if(isHighSecurity){
//更新数据记录 //更新数据记录
if (type == 'new') { if (type == 'new') {
var fileName = obj.publishFileName + ' V' + obj.fileVersion + '.0-流程手册'; var fileName = obj.publishFileName + ' V' + obj.fileVersion + '-' + getOutputName(category);
$(object).text(fileName); $(object).text(fileName);
} else if (type == 'change') { } else if (type == 'change') {
var targetFileName = obj.changedFileNameNew + ' V' + obj.targetFileVersion + '.0-流程手册'; var targetFileName = obj.changedFileNameNew + ' V' + obj.targetFileVersion + '-' + getOutputName(category);
$(object).text(targetFileName); $(object).text(targetFileName);
} }
}else{ }else{
debugger;
//更新数据记录 //更新数据记录
if (type == 'new') { if (type == 'new') {
var fileName = obj.publishFileName + ' V' + obj.fileVersion + '.0-流程手册'; var fileName = obj.publishFileName + ' V' + obj.fileVersion + '-' + getOutputName(category);
$(object).text(fileName); $(object).text(fileName);
for (var i = 0; i < newTemp.length; i++) { for (var i = 0; i < newTemp.length; i++) {
if (newTemp[i].id == uuid) { if (newTemp[i].publishFileId == uuid) {
newTemp[i].taskId = taskId; newTemp[i].taskId = taskId;
} }
} }
} else if (type == 'change') { } else if (type == 'change') {
var targetFileName = obj.changedFileNameNew + ' V' + obj.targetFileVersion + '.0-流程手册'; var targetFileName = obj.changedFileNameNew + ' V' + obj.targetFileVersion + '-' + getOutputName(category);
$(object).text(targetFileName); $(object).text(targetFileName);
for (var i = 0; i < changeTemp.length; i++) { for (var i = 0; i < changeTemp.length; i++) {
if (changeTemp[i].id == uuid) { if (changeTemp[i].changedFileIdNew == uuid) {
changeTemp[i].taskId = taskId; changeTemp[i].taskId = taskId;
} }
} }
} }
} }
$(object).parent().append('<span id="download_output_' + uuid + '" style="cursor: pointer;" onclick="downloadReport(\'' + uuid + '\',\'' + taskId + '\')"><i class="awsui-iconfont" style="font-size: 12px;">&#xe653;</i></span>');
} }
// 清空树结构 // 清空树结构
@ -1778,7 +1807,7 @@ function saveFormData(type) {
var msg = '以下文件已经在其他未办理完成的表单中，不允许保存/办理'; var msg = '以下文件已经在其他未办理完成的表单中，不允许保存/办理';
if (tempData.length > 0) { if (tempData.length > 0) {
for (var i = 0; i < tempData.length; i++) { for (var i = 0; i < tempData.length; i++) {
msg += '<br>' + tempData[i].name + ' V' + tempData[i].version + '.0'; msg += '<br>' + tempData[i].name + ' V' + tempData[i].version;
} }
} }
var options = { var options = {
@ -1807,6 +1836,7 @@ function formSave(isTransact){
$.simpleAlert('发布内容不能为空', 'info'); $.simpleAlert('发布内容不能为空', 'info');
return false; return false;
} }
debugger;
var index = 0; var index = 0;
if (!($("#publisher_new_tr").css('display') == 'none') && newTemp.length > 0) { if (!($("#publisher_new_tr").css('display') == 'none') && newTemp.length > 0) {
index++; index++;
@ -1830,7 +1860,7 @@ function formSave(isTransact){
for (var i = 0; i < changeTemp.length; i++) { for (var i = 0; i < changeTemp.length; i++) {
if (changeTemp[i].changedFileIdNew == "") { if (changeTemp[i].changedFileIdNew == "") {
flag = true; flag = true;
msg += '<br>' + changeTemp[i].changeFileName + ' V' + changeTemp[i].fileVersion + '.0'; msg += '<br>' + changeTemp[i].changeFileName + ' V' + changeTemp[i].fileVersion;
} }
} }
if (flag) { if (flag) {
@ -1868,7 +1898,7 @@ function formSave(isTransact){
for (var j = 0; j < stopTempData.length; j++) { for (var j = 0; j < stopTempData.length; j++) {
if (changeTempData[i].changeFileId == stopTempData[j].stopFileId) { if (changeTempData[i].changeFileId == stopTempData[j].stopFileId) {
$.simpleAlert('close'); $.simpleAlert('close');
$.simpleAlert(stopTempData[j].stopFileName + ' V' + stopTempData[j].fileVersion + '.0' + "<br>在变更流程和停用流程中同时存在，不允许办理", 'error'); $.simpleAlert(stopTempData[j].stopFileName + ' V' + stopTempData[j].fileVersion + "<br>在变更流程和停用流程中同时存在，不允许办理", 'error');
return false; return false;
} }
} }
@ -1923,7 +1953,7 @@ function formSave(isTransact){
var msg = '以下文件已经在其他未办理完成的表单中，不允许保存/办理'; var msg = '以下文件已经在其他未办理完成的表单中，不允许保存/办理';
if (tempData.length > 0) { if (tempData.length > 0) {
for (var i = 0; i < tempData.length; i++) { for (var i = 0; i < tempData.length; i++) {
msg += '<br>' + tempData[i].name + ' V' + tempData[i].version + '.0'; msg += '<br>' + tempData[i].name + ' V' + tempData[i].version;
} }
} }
var options = { var options = {
@ -2217,3 +2247,26 @@ function listenCloseEvent() {
}); });
} }
} }
function downloadReport(uuid, taskId) {
awsui.ajax.request({
type: "POST",
url: "./jd",
async: false,
data: {
sid: sid,
cmd: "com.actionsoft.apps.coe.pal.publisher_output_download",
taskId: taskId,
uuid: uuid
},
success : function(r) {
debugger;
if (r.result == "ok") {
debugger;
window.open (r.data.url);
} else {
}
}
});
}

12
com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.radio.js
View File

@ -228,7 +228,7 @@ var changeOption;
*/ */
function initPublishData(data, type, isEnd, proNumber) { function initPublishData(data, type, isEnd, proNumber) {
if (type == 'new') { if (type == 'new') {
var fileName = data.publishFileName + ' V' + data.fileVersion + '.0'; var fileName = data.publishFileName + ' V' + data.fileVersion;
var aHtml = '<a class="link" href="javascript:void(0);" onclick="openPortalPage(\'' + data.publishFileId + '\', \'' + data.taskId + '\')">' + fileName + '</a>'; var aHtml = '<a class="link" href="javascript:void(0);" onclick="openPortalPage(\'' + data.publishFileId + '\', \'' + data.taskId + '\')">' + fileName + '</a>';
$('#publisher_new_file_name').children('span.file_name').html(aHtml); $('#publisher_new_file_name').children('span.file_name').html(aHtml);
$('#publisher_new_file_id').val(data.publishFileId); $('#publisher_new_file_id').val(data.publishFileId);
@ -250,14 +250,14 @@ function initPublishData(data, type, isEnd, proNumber) {
if (type == 'change') { if (type == 'change') {
changeData = data; changeData = data;
// 变更文件处理 // 变更文件处理
var sourceFileName = data.changeFileName + ' V' + data.fileVersion + '.0'; var sourceFileName = data.changeFileName + ' V' + data.fileVersion;
$('#publisher_change_source_file_name').children('span.file_name').html(sourceFileName); $('#publisher_change_source_file_name').children('span.file_name').html(sourceFileName);
$('#publisher_change_source_file_id').val(data.changeFileId); $('#publisher_change_source_file_id').val(data.changeFileId);
// 变更目标文件处理 // 变更目标文件处理
var targetFileName = ""; var targetFileName = "";
if (data.changedFileNameNew != undefined && data.changedFileNameNew != '') { if (data.changedFileNameNew != undefined && data.changedFileNameNew != '') {
targetFileName = data.changedFileNameNew + ' V' + data.targetFileVersion + '.0'; targetFileName = data.changedFileNameNew + ' V' + data.targetFileVersion;
} }
var targetId = ""; var targetId = "";
if (data.changedFileIdNew != undefined && data.changedFileIdNew != '') { if (data.changedFileIdNew != undefined && data.changedFileIdNew != '') {
@ -288,7 +288,7 @@ function initPublishData(data, type, isEnd, proNumber) {
var flag = false; var flag = false;
for (var i = 0; i < data.targetFiles.length; i++) { for (var i = 0; i < data.targetFiles.length; i++) {
var temp = data.targetFiles[i]; var temp = data.targetFiles[i];
var name = temp.text + ' V' + temp.version + '.0'; var name = temp.text + ' V' + temp.version;
var obj = {id:temp.id, text:name}; var obj = {id:temp.id, text:name};
opt1.data.push(obj); opt1.data.push(obj);
if (targetId == temp.id) { if (targetId == temp.id) {
@ -324,7 +324,7 @@ function initPublishData(data, type, isEnd, proNumber) {
} }
} }
if (type == 'stop') { if (type == 'stop') {
var fileName = data.stopFileName + ' V' + data.fileVersion + '.0'; var fileName = data.stopFileName + ' V' + data.fileVersion;
var aHtml = '<a class="link" href="javascript:void(0);" onclick="openPortalPage(\'' + data.stopFileId + '\', \'' + data.taskId + '\')">' + fileName + '</a>'; var aHtml = '<a class="link" href="javascript:void(0);" onclick="openPortalPage(\'' + data.stopFileId + '\', \'' + data.taskId + '\')">' + fileName + '</a>';
$('#publisher_stop_file_name').children('span.file_name').html(aHtml); $('#publisher_stop_file_name').children('span.file_name').html(aHtml);
$('#publisher_stop_file_id').val(data.stopFileId); $('#publisher_stop_file_id').val(data.stopFileId);
@ -957,7 +957,7 @@ function formSave(isTransact){
if (r.result == 'error') { if (r.result == 'error') {
flag = true; flag = true;
var data = r.data.data; var data = r.data.data;
var name = data.name + ' V' + data.version + '.0'; var name = data.name + ' V' + data.version;
console.log(data); console.log(data);
tempName = name; tempName = name;
} }

BIN
com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
View File

Binary file not shown.

40
com.actionsoft.apps.coe.pal/method/control.kpi/diagram.attribute.custom.xml
View File

@ -1,26 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<attributes type="customer"> <attributes type="customer">
<attribute key="Number_of_the_associated_flow_file" title="关联流程文件编号" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="Number_of_the_associated_flow_file" title="关联流程文件编号" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="关联流程文件编号" isRequired="false"/>
<attribute key="Associated_process_name" title="关联流程名称" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="Associated_process_name" title="关联流程名称" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="关联流程名称" isRequired="false"/>
<attribute key="Process_performance_indicator_Number" title="流程绩效指标编号" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="Process_performance_indicator_Number" title="流程绩效指标编号" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="流程绩效指标编号" isRequired="false"/>
<attribute key="Name_process_performance_indicator" title="流程绩效指标名称" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="Name_process_performance_indicator" title="流程绩效指标名称" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
<attribute key="ndicator_User_defined_label" title="指标自定义标签" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="ndicator_User_defined_label" title="指标自定义标签" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="指标自定义标签" isRequired="false"/>
<attribute key="Data_fetch_logic" title="数据取数逻辑" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="Data_fetch_logic" title="数据取数逻辑" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="数据取数逻辑" isRequired="false"/>
<attribute key="Take_the_number_aperture" title="取数口径" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="Take_the_number_aperture" title="取数口径" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="取数口径" isRequired="false"/>
<attribute key="unit_measurement" title="计量单位" type="select" value="" ref="天,%,金额" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="unit_measurement" title="计量单位" type="select" value="" ref="天,%,金额" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="计量单位" isRequired="false"/>
<attribute key="statistical_period" title="统计周期" type="select" value="" ref="月度,季度,半年度,年度" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="statistical_period" title="统计周期" type="select" value="" ref="月度,季度,半年度,年度" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="统计周期" isRequired="false"/>
<attribute key="Platform_data_Display" title="平台数据展示" type="select" value="" ref="是,否" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="Platform_data_Display" title="平台数据展示" type="select" value="" ref="是,否" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="平台数据展示" isRequired="false"/>
<attribute key="computational_formula" title="计算公式" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="computational_formula" title="计算公式" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="计算公式" isRequired="false"/>
<attribute key="The_upstream_indicators" title="上游指标" type="relation" value="" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="The_upstream_indicators" title="上游指标" type="relation" value="" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true" desc="上游指标" isRequired="false"/>
<attribute key="Downstream_target" title="下游指标" type="relation" value="" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="Downstream_target" title="下游指标" type="relation" value="" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true" desc="下游指标" isRequired="false"/>
<attribute key="Index_definition" title="指标定义" type="textarea" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="Index_definition" title="指标定义" type="textarea" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="指标定义" isRequired="false"/>
<attribute key="remark" title="备注" type="textarea" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="remark" title="备注" type="textarea" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="备注" isRequired="false"/>
<attribute key="Process_Architecture_L1" title="L1" type="string" value="" desc="1" isRequired="false" ref="" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="Process_Architecture_L1" title="L1" type="string" value="" desc="L1" isRequired="false" ref="" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>
<attribute key="Process_Architecture_L2" title="L2" type="string" value="" desc="1" isRequired="false" ref="" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="Process_Architecture_L2" title="L2" type="string" value="" desc="L2" isRequired="false" ref="" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>
<attribute key="Process_Architecture_L3" title="L3" type="string" value="" desc="1" isRequired="false" ref="" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="Process_Architecture_L3" title="L3" type="string" value="" desc="L3" isRequired="false" ref="" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>
<attribute key="element" title="元素" type="table" value="" desc="元素" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
<attribute key="set_the_purpose" title="设置目的" type="string" value="" desc="设置目的" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="set_the_purpose" title="设置目的" type="string" value="" desc="设置目的" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
<attribute key="data_sources" title="数据来源" type="string" value="" desc="数据来源" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="data_sources" title="数据来源" type="string" value="" desc="数据来源" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
<attribute key="explain" title="说明" type="string" value="" desc="说明" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="explain" title="说明" type="string" value="" desc="说明" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
<attribute key="number" title="编号" type="string" value="" desc="编号" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="desc" title="描述" type="textarea" value="" desc="描述" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="level" title="层次" type="string" value="" desc="层次" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="target_value" title="指标值" type="string" value="" desc="指标值" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="element" title="元素" type="table" value="" desc="元素" isRequired="false" ref="{&quot;firstColumn&quot;:&quot;元素&quot;,&quot;secondColumn&quot;:&quot;数据类型&quot;}" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
</attributes> </attributes>

21
com.actionsoft.apps.coe.pal/method/control.policy/diagram.attribute.custom.xml
View File

@ -3,19 +3,19 @@
<attributes type="customer"> <attributes type="customer">
<attribute key="Purpose" title="目的" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true" desc="目的" isRequired="false"/> <attribute key="Purpose" title="目的" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true" desc="目的" isRequired="false"/>
<attribute key="file_number" title="文件编码" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true" desc="文件编码" isRequired="false"/> <attribute key="file_number" title="文件编码" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true" desc="文件编码" isRequired="false"/>
<attribute key="R_Organizational_and_role_responsibilities" title="组织/角色职责" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="R_Organizational_and_role_responsibilities" title="组织/角色职责" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="组织/角色职责" isRequired="false"/>
<attribute key="application" title="适用范围" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/> <attribute key="application" title="适用范围" type="string" value="" desc="适用范围" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="versions" title="版本" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/> <attribute key="versions" title="版本" type="string" value="" desc="版本" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="Drafted_and_revised_by" title="拟制/修订人" type="string" value="" desc="拟制/修订人" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> <attribute key="Drafted_and_revised_by" title="拟制/修订人" type="string" value="" desc="拟制/修订人" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="Process_Architecture_L1" title="流程架构L1" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/> <attribute key="Process_Architecture_L1" title="流程架构L1" type="string" value="" desc="流程架构L1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="Process_Architecture_L2" title="流程架构L2" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/> <attribute key="Process_Architecture_L2" title="流程架构L2" type="string" value="" desc="流程架构L2" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="Process_Architecture_L3" title="流程架构L3" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/> <attribute key="Process_Architecture_L3" title="流程架构L3" type="string" value="" desc="流程架构L3" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="auditor" title="审核人" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> <attribute key="auditor" title="审核人" type="string" value="" desc="审核人" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="reviewer" title="复核人" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> <attribute key="reviewer" title="复核人" type="string" value="" desc="复核人" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="approver" title="审批人" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> <attribute key="approver" title="审批人" type="string" value="" desc="审批人" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="related_files" title="相关文件" type="relation" value="" desc="相关文件" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="%" isValid="true"/> <attribute key="related_files" title="相关文件" type="relation" value="" desc="相关文件" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="support_files" title="支持文件" type="relation" value="" desc="支持文件" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="%" isValid="true"/> <attribute key="support_files" title="支持文件" type="relation" value="" desc="支持文件" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="T_supplementary_articles" title="附则" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> <attribute key="T_supplementary_articles" title="附则" type="string" value="" desc="附则" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="Process_owner" title="流程责任人" type="awsorg" value="" desc="流程责任人" isRequired="false" ref="{&quot;scope&quot;:[&quot;user&quot;],&quot;multiple&quot;:false}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="Process_owner" title="流程责任人" type="awsorg" value="" desc="流程责任人" isRequired="false" ref="{&quot;scope&quot;:[&quot;user&quot;],&quot;multiple&quot;:false}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>
<attribute key="effective_date" title="生效日期" type="DateTimePicker" value="" desc="生效日期" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/> <attribute key="effective_date" title="生效日期" type="DateTimePicker" value="" desc="生效日期" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="Contents_and_reasons_for_revision" title="修订内容及理由" type="string" value="" desc="修订内容及理由" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> <attribute key="Contents_and_reasons_for_revision" title="修订内容及理由" type="string" value="" desc="修订内容及理由" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
@ -28,4 +28,5 @@
<attribute key="term" title="术语" type="table" value="" desc="术语" isRequired="false" ref="{&quot;firstColumn&quot;:&quot;术语&quot;,&quot;secondColumn&quot;:&quot;定义&quot;}" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> <attribute key="term" title="术语" type="table" value="" desc="术语" isRequired="false" ref="{&quot;firstColumn&quot;:&quot;术语&quot;,&quot;secondColumn&quot;:&quot;定义&quot;}" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="Organizational_role" title="组织角色" type="table" value="" desc="组织角色" isRequired="false" ref="{&quot;firstColumn&quot;:&quot;组织&quot;,&quot;secondColumn&quot;:&quot;职责&quot;}" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> <attribute key="Organizational_role" title="组织角色" type="table" value="" desc="组织角色" isRequired="false" ref="{&quot;firstColumn&quot;:&quot;组织&quot;,&quot;secondColumn&quot;:&quot;职责&quot;}" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="content" title="内容" type="string" value="" desc="内容" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> <attribute key="content" title="内容" type="string" value="" desc="内容" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="company" title="编制单位" type="string" value="" desc="编制单位" isRequired="false" ref="" readonly="false" groupPath="organization" scope="*" isValid="true"/>
</attributes> </attributes>

19
com.actionsoft.apps.coe.pal/method/data.form/diagram.attribute.custom.xml
View File

@ -3,17 +3,18 @@
<attributes type="customer"> <attributes type="customer">
<attribute key="Form_name" title="表单名称" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true" desc="表单名称" isRequired="true"/> <attribute key="Form_name" title="表单名称" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true" desc="表单名称" isRequired="true"/>
<attribute key="form_number" title="表单编码" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true" desc="表单编码" isRequired="false"/> <attribute key="form_number" title="表单编码" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true" desc="表单编码" isRequired="false"/>
<attribute key="P_versions" title="版本" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> <attribute key="P_versions" title="版本" type="string" value="" desc="版本" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="Drafted_and_revised_by" title="拟制/修订人" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> <attribute key="Drafted_and_revised_by" title="拟制/修订人" type="string" value="" desc="拟制/修订人" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="Process_Architecture_L1" title="流程架构L1" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> <attribute key="Process_Architecture_L1" title="流程架构L1" type="string" value="" desc="流程架构L1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="Process_Architecture_L2" title="流程架构L2" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> <attribute key="Process_Architecture_L2" title="流程架构L2" type="string" value="" desc="流程架构L2" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="Drafted_and_revised_date" title="拟制/修订日期" type="DateTimePicker" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/> <attribute key="Drafted_and_revised_date" title="拟制/修订日期" type="DateTimePicker" value="" desc="拟制/修订日期" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="Process_Architecture_L3" title="流程架构L3" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> <attribute key="Process_Architecture_L3" title="流程架构L3" type="string" value="" desc="流程架构L3" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="auditor" title="审核人" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> <attribute key="auditor" title="审核人" type="string" value="" desc="审核人" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="reviewer" title="复核人" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> <attribute key="reviewer" title="复核人" type="string" value="" desc="复核人" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="approver" title="审批人" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> <attribute key="approver" title="审批人" type="string" value="" desc="审批人" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="form_effective_date" title="生效日期" type="DateTimePicker" value="" desc="生效日期" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> <attribute key="form_effective_date" title="生效日期" type="DateTimePicker" value="" desc="生效日期" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="form_Scope_application" title="适用范围" type="string" value="" desc="适用范围" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> <attribute key="form_Scope_application" title="适用范围" type="string" value="" desc="适用范围" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="Issuing_department" title="拟制/修订单位" type="string" value="" desc="拟制/修订单位" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> <attribute key="Issuing_department" title="拟制/修订单位" type="string" value="" desc="拟制/修订单位" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="Contents_and_reasons_for_revision" title="修订内容及理由" type="string" value="" desc="修订内容及理由" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> <attribute key="Contents_and_reasons_for_revision" title="修订内容及理由" type="string" value="" desc="修订内容及理由" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="number" title="必要字段" type="string" value="" desc="必要字段" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
</attributes> </attributes>

2
com.actionsoft.apps.coe.pal/method/org.normal/diagram.attribute.custom.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<attributes type="customer"> <attributes type="customer">
<attribute key="post" title="岗位" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/> <attribute key="post" title="岗位" type="relation" value="" desc="岗位" isRequired="false" ref="{&quot;method&quot;:&quot;org.normal&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:true,&quot;value&quot;:&quot;&quot;}" readonly="true" groupPath="baseAttribute" scope="%,*" isValid="true"/>
</attributes> </attributes>

11
com.actionsoft.apps.coe.pal/method/org.role/diagram.attribute.custom.xml
View File

@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<attributes type="customer"> <attributes type="customer">
<attribute key="post" title="岗位" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="post_text" title="岗位文本" type="string" value="" desc="岗位文本信息" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
<attribute key="post_test" title="岗位" type="string" value="" desc="岗位" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> <attribute key="post_test" title="岗位" type="string" value="" desc="岗位" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
<attribute key="number" title="编号" type="string" value="" desc="编号" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="desc" title="描述" type="textarea" value="" desc="描述" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="level" title="层次" type="string" value="" desc="层次" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="target_value" title="指标值" type="string" value="" desc="指标值" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="calculation_method" title="计算方式" type="string" value="" desc="计算方式" isRequired="false" ref="" readonly="false" groupPath="targetCount" scope="*" isValid="true"/>
<attribute key="calculation_proportion" title="计算比例" type="string" value="" desc="计算比例" isRequired="false" ref="" readonly="false" groupPath="targetCount" scope="*" isValid="true"/>
<attribute key="calculation_frequency" title="计算频率" type="string" value="" desc="计算频率" isRequired="false" ref="" readonly="false" groupPath="targetCount" scope="*" isValid="true"/>
<attribute key="post" title="岗位" type="relation" value="" desc="岗位" isRequired="false" ref="{&quot;method&quot;:&quot;org.normal&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:true,&quot;value&quot;:&quot;&quot;}" readonly="true" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="post_text" title="岗位文本" type="textarea" value="" desc="岗位文本" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
</attributes> </attributes>

97
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java
View File

@ -2663,6 +2663,103 @@ public class PALRepositoryQueryAPIManager {
return result; return result;
} }
/**
* 导出单个表单手册
* 仅限于应用流程手册com.awspaas.user.apps.coe.pal.output.bd下的手册导出
* @param wsId 资产库Id
* @param userId 用户Id
* @param teamId 小组Id
* @param fileId 流程文件Id
* @return 返回创建流程手册结果及taskId
*/
public String createOutputReportBd(String wsId, String userId, String teamId, String fileId) {
UserContext _uc = UserContext.fromUID(userId);
OutPutReportWeb web = new OutPutReportWeb(_uc);
String appId = "com.awspaas.user.apps.coe.pal.output.bd";
// 报告生成器参数配置
String config = "{'isItReport':true,'orderNuberFirst':true,'orderNametwo':false,'reportNameIsItName':'%fileName%_%fileVersion%'}";// 配置
String title = "表单-手册";
// 获取流程手册下所有的流程模板
List<OutputAppProfile> list = web.getOutputAppByAppId(appId);
OutputAppProfile outputAppProfile = null;
for (OutputAppProfile profile : list) {
if (!"".equals(title) && title.equals(profile.getTitle())) {
outputAppProfile = profile;
break;
}
}
if (outputAppProfile == null) {
throw new AWSException("创建表单手册失败,未找到报告模版");
}
String profileId = outputAppProfile.getId();
String taskName = outputAppProfile.getTitle();
String language = "".equals(outputAppProfile.getLang())?"cn":outputAppProfile.getLang();
String isExecute = "Y";
String targetShape = "";
String relationFileId = "";
String isModify = "false";
String taskId = "";
String result = web.reportSaveByCallable(language, taskName, userId, teamId, profileId, wsId, isExecute, config, fileId, targetShape, relationFileId, isModify, taskId);
ResponseObject ro = ResponseObject.parse(result);
if (ro.isOk()) {
com.alibaba.fastjson.JSONObject object = (com.alibaba.fastjson.JSONObject) ro.getData();
String id = object.getString("taskId");
// 更改状态为隐藏，不在界面显示该方式创建的流程手册数据
new OutputTask().updateIsDisplayStatus(id);
}
return result;
}
/**
* 导出单个制度手册
* 仅限于应用流程手册com.awspaas.user.apps.coe.pal.output.bd下的手册导出
* @param wsId 资产库Id
* @param userId 用户Id
* @param teamId 小组Id
* @param fileId 流程文件Id
* @return 返回创建流程手册结果及taskId
*/
public String createOutputReportZd(String wsId, String userId, String teamId, String fileId) {
UserContext _uc = UserContext.fromUID(userId);
OutPutReportWeb web = new OutPutReportWeb(_uc);
String appId = "com.awspaas.user.apps.coe.pal.output.zd";
// 报告生成器参数配置
String config = "{'isItReport':true,'orderNuberFirst':true,'orderNametwo':false,'reportNameIsItName':'%fileName%_%fileVersion%'}";// 配置
String title = "制度-手册";
// 获取流程手册下所有的流程模板
List<OutputAppProfile> list = web.getOutputAppByAppId(appId);
OutputAppProfile outputAppProfile = null;
for (OutputAppProfile profile : list) {
if (!"".equals(title) && title.equals(profile.getTitle())) {
outputAppProfile = profile;
break;
}
}
if (outputAppProfile == null) {
throw new AWSException("创建制度手册失败,未找到报告模版");
}
String profileId = outputAppProfile.getId();
String taskName = outputAppProfile.getTitle();
String language = "".equals(outputAppProfile.getLang())?"cn":outputAppProfile.getLang();
String isExecute = "Y";
String targetShape = "";
String relationFileId = "";
String isModify = "false";
String taskId = "";
String result = web.reportSaveByCallable(language, taskName, userId, teamId, profileId, wsId, isExecute, config, fileId, targetShape, relationFileId, isModify, taskId);
ResponseObject ro = ResponseObject.parse(result);
if (ro.isOk()) {
com.alibaba.fastjson.JSONObject object = (com.alibaba.fastjson.JSONObject) ro.getData();
String id = object.getString("taskId");
// 更改状态为隐藏，不在界面显示该方式创建的流程手册数据
new OutputTask().updateIsDisplayStatus(id);
}
return result;
}
/** /**
* 预览流程手册 * 预览流程手册
* @param _uc * @param _uc

5
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/RepositoryTreeUtil.java
View File

@ -11,6 +11,7 @@ import com.actionsoft.apps.coe.pal.constant.CoEConstant;
import com.actionsoft.apps.coe.pal.pal.method.cache.PALMethodCache; import com.actionsoft.apps.coe.pal.pal.method.cache.PALMethodCache;
import com.actionsoft.apps.coe.pal.pal.method.model.PALMethodModel; import com.actionsoft.apps.coe.pal.pal.method.model.PALMethodModel;
import com.actionsoft.apps.coe.pal.pal.repository.web.CoeProcessLevelWeb; import com.actionsoft.apps.coe.pal.pal.repository.web.CoeProcessLevelWeb;
import com.actionsoft.apps.coe.pal.pal.ws.web.VersionUtil;
import com.actionsoft.apps.coe.pal.util.HighSecurityUtil; import com.actionsoft.apps.coe.pal.util.HighSecurityUtil;
import com.actionsoft.bpms.commons.mvc.view.ResponseObject; import com.actionsoft.bpms.commons.mvc.view.ResponseObject;
import com.actionsoft.bpms.org.model.DepartmentModel; import com.actionsoft.bpms.org.model.DepartmentModel;
@ -94,7 +95,7 @@ public class RepositoryTreeUtil {
palObject.put("name", palModel.getName()); palObject.put("name", palModel.getName());
palObject.put("pid", palModel.getParentId()); palObject.put("pid", palModel.getParentId());
palObject.put("versionId", palModel.getVersionId()); palObject.put("versionId", palModel.getVersionId());
palObject.put("version", palModel.getVersion()); palObject.put("version", VersionUtil.getVersionStr(palModel.getVersion()));
palObject.put("category", palModel.getMethodCategory()); palObject.put("category", palModel.getMethodCategory());
palObject.put("method", palModel.getMethodId()); palObject.put("method", palModel.getMethodId());
// 责任部门和责任人 // 责任部门和责任人
@ -187,7 +188,7 @@ public class RepositoryTreeUtil {
palObject.put("name", palModel.getName()); palObject.put("name", palModel.getName());
palObject.put("pid", palModel.getParentId()); palObject.put("pid", palModel.getParentId());
palObject.put("versionId", palModel.getVersionId()); palObject.put("versionId", palModel.getVersionId());
palObject.put("version", palModel.getVersion()); palObject.put("version", VersionUtil.getVersionStr(palModel.getVersion()));
palObject.put("category", palModel.getMethodCategory()); palObject.put("category", palModel.getMethodCategory());
palObject.put("method", palModel.getMethodId()); palObject.put("method", palModel.getMethodId());
// 责任部门和责任人 // 责任部门和责任人