diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java index 66169ee3..50e31b9a 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java +++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java @@ -24,12 +24,14 @@ import com.actionsoft.apps.coe.pal.pal.output.util.OutputWordUtil; 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.PALRepositoryPropertyCache; +import com.actionsoft.apps.coe.pal.pal.repository.dao.CoeProcessLevelDaoFacotory; import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.cache.DesignerShapeRelationCache; import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.dao.DesignerShapeRelationDao; import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.model.DesignerShapeRelationModel; import com.actionsoft.apps.coe.pal.pal.repository.designer.util.CoeDesignerUtil; import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel; import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryPropertyModel; +import com.actionsoft.apps.coe.pal.pal.repository.model.impl.PALRepositoryModelImpl; import com.actionsoft.apps.coe.pal.pal.repository.upfile.constant.CoeFileConstant; import com.actionsoft.apps.coe.pal.pal.repository.upfile.dao.UpFileDao; import com.actionsoft.apps.coe.pal.pal.repository.upfile.model.UpfileModel; @@ -280,6 +282,7 @@ public class Report1Gener { } prReportComment.getCommentContent2(dataMap, repositoryModel);//获取一些公共的数据(手册首页的手册岗位名称、部门、时间等) JSONArray repositoryShapeTable = new JSONArray();//流程步骤Table + JSONArray roleMappingPostTable = new JSONArray(); @@ -376,12 +379,14 @@ public class Report1Gener { int index = 1;// 流程步骤序号 int dangerIndex = 1;// 风险序号 int regulateIndex = 1;// 控制序号 + int roleMappingPostIndex =1;//控制序号 for (Map shape : repositoryFileElements) { //过滤导出的图形类型 if ("method_approval_node,method_service_node,method_approval_node3,method_service_node4,decision".indexOf((String)shape.get("type")) == -1) { continue; } JSONObject _tr = new JSONObject(); + JSONObject _roleMappingPostTr = new JSONObject(); OutputWordUtil.setShapeDefaultValue2(repositoryId, _tr); //设置默认值 @@ -496,9 +501,31 @@ public class Report1Gener { regulateIndex = setTableValueOfControlAndRisk(attrId, repositoryId, shape.get("id").toString(), regulateTable, regulateIndex, _tr.getString(OutputWordUtil.SHAPE_NAME), relationFileMap); regulateSet.clear(); } + + //如果当前属性是role，则查询该角色有无关联岗位信息 + if("role".equals(attrId)){ + String shapeId = shape.get("id").toString(); + //查询该角色有没有保定岗位 + //先查询该UUID的角色映射关系， + String querySqlRole = " SELECT RELATIONSHAPEID FROM APP_ACT_COE_PAL_SHAPE_RLAT WHERE SHAPEID = ? AND ATTRID = ?"; + String relationShapeId = DBSql.getString(querySqlRole, new Object[]{shapeId, "role"}); + String querySql = " SELECT RELATIONSHAPETEXT FROM APP_ACT_COE_PAL_SHAPE_RLAT WHERE SHAPEID = ? AND ATTRID = ?"; + String postInfo = DBSql.getString(querySql, new Object[]{relationShapeId, "post"}); + if(UtilString.isNotEmpty(postInfo)){ + _roleMappingPostTr.put("shape_number",roleMappingPostIndex); + _roleMappingPostTr.put("roleMapping_role",attrValue); + _roleMappingPostTr.put("roleMapping_post",postInfo); + //如果存在角色关联岗位的则加个*号 + _tr.put("shape_" + attrId, "*"+attrValue.replace("\n", WRAPSTRING)); + roleMappingPostIndex++; + } + } } } repositoryShapeTable.add(_tr); + if(!_roleMappingPostTr.isEmpty()){ + roleMappingPostTable.add(_roleMappingPostTr); + } index++; } } @@ -771,7 +798,10 @@ public class Report1Gener { dataMap.put("metrics_count", metrics.size());// dataMap.put(OutputWordUtil.TABLE_REPOSITORY_SHAPE, repositoryShapeTable); - dataMap.put("TABLE_REPOSITORY_SHAPE_COUNT", repositoryShapeTable.size()); + dataMap.put("TABLE_REPOSITORY_SHAPE_COUNT", repositoryShapeTable.size()); //roleMappingPostTable + + dataMap.put("roleMappingPostTable", roleMappingPostTable); + dataMap.put("roleMappingPostTableCount", roleMappingPostTable.size()); boolean contains = isNumberAscArray.contains("false"); if(contains) { fileTable.sort(Comparator.comparing(obj -> ((JSONObject) obj).getString("file_name"))); diff --git a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml index c6932027..7bbc0e4e 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml +++ b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml @@ -1,29 +1,29 @@ + xmlns:aml="http://schemas.microsoft.com/aml/2001/core" + xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" + xmlns:cx="http://schemas.microsoft.com/office/drawing/2014/chartex" + xmlns:cx1="http://schemas.microsoft.com/office/drawing/2015/9/8/chartex" + xmlns:cx2="http://schemas.microsoft.com/office/drawing/2015/10/21/chartex" + xmlns:cx3="http://schemas.microsoft.com/office/drawing/2016/5/9/chartex" + xmlns:cx4="http://schemas.microsoft.com/office/drawing/2016/5/10/chartex" + xmlns:cx5="http://schemas.microsoft.com/office/drawing/2016/5/11/chartex" + xmlns:cx6="http://schemas.microsoft.com/office/drawing/2016/5/12/chartex" + xmlns:cx7="http://schemas.microsoft.com/office/drawing/2016/5/13/chartex" + xmlns:cx8="http://schemas.microsoft.com/office/drawing/2016/5/14/chartex" + xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:aink="http://schemas.microsoft.com/office/drawing/2016/ink" + xmlns:am3d="http://schemas.microsoft.com/office/drawing/2017/model3d" + xmlns:o="urn:schemas-microsoft-com:office:office" + xmlns:v="urn:schemas-microsoft-com:vml" + xmlns:w10="urn:schemas-microsoft-com:office:word" + xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" + xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" + xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" + xmlns:wsp="http://schemas.microsoft.com/office/word/2003/wordml/sp2" + xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" w:macrosPresent="no" w:embeddedObjPresent="no" w:ocxPresent="no" xml:space="preserve"> 洪继程 @@ -2609,6 +2609,8 @@ y7fdOgAAAABJRU5ErkJggk== + + @@ -3177,7 +3179,7 @@ y7fdOgAAAABJRU5ErkJggk== - <#list version_history_table as table8> + <#list version_history_table as table8> @@ -3485,8 +3487,7 @@ y7fdOgAAAABJRU5ErkJggk== - <#if (goal_table_count >0 )> - + @@ -3510,8 +3511,8 @@ y7fdOgAAAABJRU5ErkJggk== - <#list goal_table as table1> - + <#list goal_table as table1> + @@ -3520,19 +3521,16 @@ y7fdOgAAAABJRU5ErkJggk== - + - ${table1} + ${table1} - -<#if (term_table_count>0 )> - - + @@ -3547,8 +3545,8 @@ y7fdOgAAAABJRU5ErkJggk== - <#if (term_table_count ==0 )> - + <#if (term_table_count ==0 )> + @@ -3556,15 +3554,15 @@ y7fdOgAAAABJRU5ErkJggk== - + - 无 + 无 - <#else> - + <#else> + @@ -3579,16 +3577,16 @@ y7fdOgAAAABJRU5ErkJggk== - + - + - + - + @@ -3607,7 +3605,7 @@ y7fdOgAAAABJRU5ErkJggk== - + @@ -3617,17 +3615,17 @@ y7fdOgAAAABJRU5ErkJggk== - + - 名称 + 名称 - + @@ -3646,7 +3644,7 @@ y7fdOgAAAABJRU5ErkJggk== - + @@ -3657,24 +3655,24 @@ y7fdOgAAAABJRU5ErkJggk== - + - 说明 + 说明 - <#list term_table as table4> - + <#list term_table as table4> + - + @@ -3692,7 +3690,7 @@ y7fdOgAAAABJRU5ErkJggk== - + @@ -3704,18 +3702,18 @@ y7fdOgAAAABJRU5ErkJggk== - + - ${table4.name} + ${table4.name} - + @@ -3733,7 +3731,7 @@ y7fdOgAAAABJRU5ErkJggk== - + @@ -3744,7 +3742,7 @@ y7fdOgAAAABJRU5ErkJggk== - + @@ -3752,7 +3750,7 @@ y7fdOgAAAABJRU5ErkJggk== - ${table4.desc} + ${table4.desc} @@ -3760,250 +3758,44 @@ y7fdOgAAAABJRU5ErkJggk== - - - - - - - -<#if (organization_table_count >0 )> - - - - - - - - - - - - 组织/角色与职责 - - - -<#if (organization_table_count ==0 )> - - - - - - - - - - - - - 无 - - -<#else> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 组织/角色 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 职责 - - - - - <#list organization_table as table5> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${table5.name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${table5.desc} - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + 组织/角色与职责 + + + + <#if (organization_table_count ==0 )> + + + + + + + + + + + + + 无 + + + <#else> @@ -4020,21 +3812,107 @@ y7fdOgAAAABJRU5ErkJggk== - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 组织/角色 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 职责 + + + + + <#list organization_table as table5> + - + - - - - + + + + @@ -4043,26 +3921,35 @@ y7fdOgAAAABJRU5ErkJggk== - + - + - - + + + + + + - - 内蒙古伊利实业集团股份有限公司 + + + + + + + ${table5.name} - + - - - - + + + + @@ -4071,2540 +3958,347 @@ y7fdOgAAAABJRU5ErkJggk== - + - + - - + - - - - - + + - + - + + + - - - - - - - - - - - - - - - - - - - - - - - - - + ${table5.desc} + + - + - - ──────────────────────────────────────────────────────────── - - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 内蒙古伊利实业集团股份有限公司 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ──────────────────────────────────────────────────────────── + + + + + + + + + + ──────────────────────────────────────────────────────────── + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 以上信息为伊利公司所有，未经允许不得外传 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PAGE + + + + + + + + + + + + + + + + + + + + 8 + + + + + + + + + + + + + + + + + + + + + - - ──────────────────────────────────────────────────────────── - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 以上信息为伊利公司所有，未经允许不得外传 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PAGE - - - - - - - - - - - - - - - - - - - - 8 - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - 流程图 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${pl_diagram} - - - - - - - - - - - - - - - - - - - -<#if (TABLE_REPOSITORY_SHAPE_COUNT >0 )> - - - - - - - - - - - - 流程说明 - - - - <#if (TABLE_REPOSITORY_SHAPE_COUNT ==0 )> - - - - - - - - - - - - - 无 - - - <#else> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - 活动序号 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 活动名称 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 活动描述 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 角色 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 输入 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 输出 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 信息系统 - - - - - <#list repository_shape_table as table2> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${table2.shape_activity_number} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${table2.shape_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${table2.shape_activity_description} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <#if (table2.shape_role == '' )> - ${table2.shape_post} - <#else> - ${table2.shape_role} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${table2.shape_input} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${table2.shape_output} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${table2.shape_information_systems} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 内蒙古伊利实业集团股份有限公司 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ─────────────────────────────────────────────────────────────────────────────────── - - - - - - - - - - ─────────────────────────────────────────────────────────────────────────────────── - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 以上信息为伊利公司所有，未经允许不得外传 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PAGE - - - - - - - - - - - - - - - - - - - - 8 - - - - - - - - - - - - - - - - - - - - - - - - - - - - -<#if (metrics_count >0 )> - - - - - - - - - - - - - - - 流程绩效指标 - - - - <#if (metrics_count ==0 )> - - - - - - - - - - - - - 无 - - - <#else> - - - - - - - - - - - - - - - - - - - - <#list pl_process_kpi_list as proKpis> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - 指标名称 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${proKpis.pl_Name_process_performance_indicator} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 设置目的 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${proKpis.pl_set_the_purpose} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 指标定义 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${proKpis.pl_Index_definition} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 计算公式 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${proKpis.pl_computational_formula} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 数据来源 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${proKpis.pl_data_sources} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 计量单位 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${proKpis.pl_unit_measurement} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 统计周期 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${proKpis.pl_statistical_period} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 说明 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${proKpis.pl_explain} - - - - - - - - - - - - - - - - - - - - - - - - - - -<#if (relevant_table_count >0 )> - - - - - - - - - - - - 相关文件 - - - -<#if (relevant_table_count ==0 )> - - - - - - - - - - - - - 无 - - -<#else> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 序号 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 文件名称 - - - - - <#list relevant_table as table6> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${table6.desc} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${table6.name} - - - - - - - - - - - - - - - - - - -<#if (supports_table_count >0 )> - - - - - - - - - - - - - - - 支持文件 - - - -<#if (supports_table_count ==0 )> - - - - - - - - - - - - - 无 - - -<#else> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 序号 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 文件名称 - - - - - <#list supports_table as table7> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${table7.desc} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${table7.name} - - - - - - - - - - - - - - - - - - -<#if (T_supplementary_articles_count >0)> - - - - - - - - - - - - - - - - - - - - - - 附则 - - - -<#list T_supplementary_articles_table as table1> - - - - - - - - - - - - - - ${table1} - - - - - - - - - - - - - -<#if (file_table_count >0 )> - - - - - - - - - - - - - - - - - - - - - - - 附件 - - - -<#if (file_table_count == 0 )> - - - - - - - - - - 无 - - -<#else> -<#list file_table as table4> - - - - - - - - - - - - - - - ${table4.file_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - 内蒙古伊利实业集团股份有限公司 + 流程图 + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -6630,175 +4324,2734 @@ y7fdOgAAAABJRU5ErkJggk== - - + ${pl_diagram} + + - - - - - - - - - ──────────────────────────────────────────────────────────── - - - - - - - - - - ──────────────────────────────────────────────────────────── - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - 以上信息为伊利公司所有，未经允许不得外传 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PAGE - - - - - - - - - - - - - - - - - - - - 9 - - - - - - - - - - - - - - - - - - - - - + - - \ No newline at end of file + + + + + + + + + + + + + 流程说明 + + + + <#if (TABLE_REPOSITORY_SHAPE_COUNT ==0 )> + + + + + + + + + + + + + 无 + + + <#else> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 活动序号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 活动名称 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 活动描述 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 角色/岗位 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 输入 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 输出 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 信息系统 + + + + + <#list repository_shape_table as table2> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${table2.shape_activity_number} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${table2.shape_name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${table2.shape_activity_description} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <#if (table2.shape_role == '' )> + ${table2.shape_post} + <#else> + ${table2.shape_role} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${table2.shape_input} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${table2.shape_output} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${table2.shape_information_systems} + + + + + + + + + <#if (roleMappingPostTableCount ==0 )> + <#else> + + + + + + + + + + + 角色岗位对应表 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 序号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 角色 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 岗位 + + + + + <#list roleMappingPostTable as table3> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${table3.shape_number} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${table3.roleMapping_role} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${table3.roleMapping_post} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 内蒙古伊利实业集团股份有限公司 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ─────────────────────────────────────────────────────────────────────────────────── + + + + + + + + + + ─────────────────────────────────────────────────────────────────────────────────── + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 以上信息为伊利公司所有，未经允许不得外传 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PAGE + + + + + + + + + + + + + + + + + + + + 8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 流程绩效指标 + + + + <#if (metrics_count ==0 )> + + + + + + + + + + + + + 无 + + + <#else> + + + + + + + + + + + + + + + + + + + + <#list pl_process_kpi_list as proKpis> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 指标名称 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${proKpis.pl_Name_process_performance_indicator} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 设置目的 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${proKpis.pl_set_the_purpose} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 指标定义 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${proKpis.pl_Index_definition} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 计算公式 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${proKpis.pl_computational_formula} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 数据来源 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${proKpis.pl_data_sources} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 计量单位 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${proKpis.pl_unit_measurement} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 统计周期 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${proKpis.pl_statistical_period} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 说明 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${proKpis.pl_explain} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 相关文件 + + + + <#if (relevant_table_count ==0 )> + + + + + + + + + + + + + 无 + + + <#else> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 序号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 文件名称 + + + + + <#list relevant_table as table6> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${table6.desc} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${table6.name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 支持文件 + + + + <#if (supports_table_count ==0 )> + + + + + + + + + + + + + 无 + + + <#else> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 序号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 文件名称 + + + + + <#list supports_table as table7> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${table7.desc} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${table7.name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 附则 + + + + <#list T_supplementary_articles_table as table1> + + + + + + + + + + + + + + ${table1} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 附件 + + + + <#if (file_table_count == 0 )> + + + + + + + + + + 无 + + + <#else> + <#list file_table as table4> + + + + + + + + + + + + + + + ${table4.file_name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 内蒙古伊利实业集团股份有限公司 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ──────────────────────────────────────────────────────────── + + + + + + + + + + ──────────────────────────────────────────────────────────── + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 以上信息为伊利公司所有，未经允许不得外传 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PAGE + + + + + + + + + + + + + + + + + + + + 9 + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java index 45fad013..9d20d80d 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java @@ -21,6 +21,8 @@ import java.util.Map.Entry; import java.util.Set; import javax.imageio.ImageIO; +import com.actionsoft.apps.coe.pal.pal.repository.cache.*; +import com.actionsoft.bpms.util.*; import org.apache.commons.lang.StringUtils; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFCellStyle; @@ -57,13 +59,6 @@ import com.actionsoft.apps.coe.pal.pal.output.extend.OutputAppProfile; import com.actionsoft.apps.coe.pal.pal.output.model.OutputTaskModel; import com.actionsoft.apps.coe.pal.pal.output.util.OutputWordUtil; import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryQueryAPIManager; -import com.actionsoft.apps.coe.pal.pal.repository.cache.CoeProcessLevelCorrelateCache; -import com.actionsoft.apps.coe.pal.pal.repository.cache.CoeProcessLevelNoCache; -import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryAttributeCache; -import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache; -import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryRemoveCache; -import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryShapeAttributeCache; -import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryShapeConfigCache; import com.actionsoft.apps.coe.pal.pal.repository.dao.CoeProcessLevelCorrelateDao; import com.actionsoft.apps.coe.pal.pal.repository.dao.CoeProcessLevelDaoFacotory; import com.actionsoft.apps.coe.pal.pal.repository.dao.PALRepository; @@ -141,11 +136,6 @@ import com.actionsoft.bpms.server.conf.server.AWSServerConf; import com.actionsoft.bpms.server.fs.DCContext; import com.actionsoft.bpms.server.fs.dc.DCProfileManager; import com.actionsoft.bpms.server.fs.dc.DCUtil; -import com.actionsoft.bpms.util.Base64; -import com.actionsoft.bpms.util.UUIDGener; -import com.actionsoft.bpms.util.UtilDate; -import com.actionsoft.bpms.util.UtilFile; -import com.actionsoft.bpms.util.UtilString; import com.actionsoft.exception.AWSException; import com.actionsoft.exception.BPMNDefException; import com.actionsoft.i18n.I18nRes; @@ -3291,6 +3281,17 @@ public class CoeDesignerWeb extends ActionWeb { relationShapes.getJSONObject(shapeId1).put(model.getAttrId(), relationShapes.getJSONObject(shapeId1).getString(model.getAttrId()) + "," + model.getRelationShapeText()); } else { relationShapes.getJSONObject(shapeId1).put(model.getAttrId(), model.getRelationShapeText()); + //增加角色自动获取岗位逻辑 + if(model.getAttrId().equals("role")){ + //查询该角色有没有保定岗位 + String querySql = " SELECT RELATIONSHAPETEXT FROM APP_ACT_COE_PAL_SHAPE_RLAT WHERE FILEID = ? AND SHAPEID = ? AND ATTRID = ?"; + String postInfo = DBSql.getString(querySql, new Object[]{model.getRelationFileId(), model.getRelationShapeId(), "post"}); + if(UtilString.isNotEmpty(postInfo)){ + relationShapes.getJSONObject(shapeId1).put("post", postInfo); + } + + } + } } else if ("awsorg".equals(attrTypeMap.get(model.getAttrId()))) { if (relationShapes.getJSONObject(shapeId1).containsKey(model.getAttrId())) {