diff --git a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/constant/Constant.java b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/constant/Constant.java index 4679079d..a883bb36 100644 --- a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/constant/Constant.java +++ b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/constant/Constant.java @@ -14,7 +14,7 @@ public class Constant { public final static double ANGLE_LEFT = 3.141592653589793; public final static double ANGLE_UP = 4.71238898038469; - // 建模属性代码--编号 + // 建模属性代码--编号 --活动序号 // public static final String METHOD_NUMBER = "number"; public static final String METHOD_NUMBER = "activity_number"; @@ -46,11 +46,11 @@ public class Constant { // 建模属性代码--前置流程 // public static final String METHOD_PRE_PROCESS = "PRE_PROCESS"; - public static final String METHOD_PRE_PROCESS = "pre_process"; + public static final String METHOD_PRE_PROCESS = "lead_process"; // 建模属性代码--后置流程 // public static final String METHOD_NEXT_PROCESS = "NEXT_PROCESS"; - public static final String METHOD_NEXT_PROCESS = "next_process"; + public static final String METHOD_NEXT_PROCESS = "rear_process"; // 流程属性--ARIS地址 // public static final String METHOD_ARIS_URL = "ARISURL"; diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java index 092f5b0c..ab2d500c 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java @@ -901,7 +901,7 @@ public class DesignerRelationShapeWeb extends ActionWeb { if ("control.kpi".equals(methodId) && methodScope.equals(methodId)) { //根据ID去查 是否有关联管流程 String tmpId = node.getString("id"); - String sql = "select FILEID from APP_ACT_COE_PAL_SHAPE_RLAT where ATTRID='lcjx' and RELATIONFILEID='%s'"; + String sql = "select FILEID from APP_ACT_COE_PAL_SHAPE_RLAT where ATTRID='Process_performance_metrics' and RELATIONFILEID='%s'"; String reId = DBSql.getString(String.format(sql, tmpId)); //还要判断是不是当前流程 if (!reId.isEmpty() && !ruuid.equals(reId)) { @@ -1097,7 +1097,7 @@ public class DesignerRelationShapeWeb extends ActionWeb { if ("control.kpi".equals(methodId) && methodScope.equals(methodId)) { //根据ID去查 是否有关联管流程 String tmpId = node.getString("id"); - String sql = "select FILEID from APP_ACT_COE_PAL_SHAPE_RLAT where ATTRID='lcjx' and RELATIONFILEID='%s'"; + String sql = "select FILEID from APP_ACT_COE_PAL_SHAPE_RLAT where ATTRID='Process_performance_metrics' and RELATIONFILEID='%s'"; String reId = DBSql.getString(String.format(sql, tmpId)); //还要判断是不是当前流程 if (!reId.isEmpty() && !ruuid.equals(reId)) { diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java index 3bca7340..933e6ba3 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java @@ -700,6 +700,13 @@ public class CoeProcessLevelUtil { DesignerShapeRelationDao dao = new DesignerShapeRelationDao(); List oldModelList = dao.getModelListByFileId(olduuid); for (DesignerShapeRelationModel oldModel : oldModelList) { + //bybzp 如果图形是过程链图和BPMN图 则不复制流程绩效和角色 + PALRepositoryModel model = PALRepositoryCache.getCache().get(uuId); + String methodId = model.getMethodId(); + if("process.bpmn2,process.epc".contains(methodId) && "lcjx,role".contains(oldModel.getAttrId())){ + continue; + } + //by bzp end if (mapNewUUID.containsKey(oldModel.getShapeId())) { DesignerShapeRelationModel newModel = new DesignerShapeRelationModel(); newModel.setId(UUIDGener.getUUID());