diff --git a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar index 1b03f195..f0285f64 100644 Binary files a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar and b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar differ diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java index 5a9ceda9..e8e79438 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java @@ -1999,7 +1999,7 @@ public class ProcessPublishWeb extends ActionWeb { List methodList = PALMethodCache.getPalMehtodList(teamId, _uc.getUID(), true); for (String method : methodList) { //新建发布过滤掉控制/组织/数据/it类数据 - if(method.equals("process") || method.equals("org") || method.equals("data") || method.equals("itsystem")){ + if(method.equals("control") || method.equals("org") || method.equals("data") || method.equals("itsystem")){ continue; } JSONObject object = new JSONObject(); @@ -3402,6 +3402,7 @@ public class ProcessPublishWeb extends ActionWeb { newBo.set("PROCESSDEFID", processInstId); newBo.set("TASKID", object.getString("taskId")); newBo.set("PUBLISH_NUMBER",object.getString("processNumber")); + newBo.set("FILETYPE",""); list.add(newBo); } SDK.getBOAPI().create(newBoName, list, bindId, _uc.getUID()); diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishExecuteListenerInterfaceImpl.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishExecuteListenerInterfaceImpl.java index bbe7be08..b1c01b79 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishExecuteListenerInterfaceImpl.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishExecuteListenerInterfaceImpl.java @@ -569,7 +569,7 @@ public class PublishExecuteListenerInterfaceImpl extends ExecuteListener impleme //去掉 /P05V1.0- String before = processNumber.substring(0, processNumber.indexOf("/")); - String after = processNumber.substring(processNumber.indexOf("-"), processNumber.length()); + String after = processNumber.substring(processNumber.indexOf("YLYYYY"), processNumber.length()); int currentnumber = 0; //拿去流程数据填充绩效模型中数据属性 @@ -630,7 +630,7 @@ public class PublishExecuteListenerInterfaceImpl extends ExecuteListener impleme if (getid.equals("Associated_process_name")) {//关联流程名称 recordBO.set("ASSOCIATED_PROCESS_NAME", value); } - if (getid.equals("Associated_process_name")) {//流程绩效指标名称 + if (getid.equals("Name_process_performance_indicator")) {//流程绩效指标名称 recordBO.set("PERFORMANCE_INDICATOR_NAME", value); } @@ -667,10 +667,26 @@ public class PublishExecuteListenerInterfaceImpl extends ExecuteListener impleme } if (getid.equals("The_upstream_indicators")) {//上游指标 - recordBO.set("THE_UPSTREAM_INDICATORS", value); + if(UtilString.isNotEmpty(value)){ + String The_upstream_indicatorsValue=value.substring(value.indexOf('"')+1,value.lastIndexOf('"')); + RowMap rowMap=DBSql.getMap("SELECT RELATIONSHAPETEXT FROM APP_ACT_COE_PAL_SHAPE_RLAT WHERE FILEID=? AND RELATIONSHAPEID=?",id,The_upstream_indicatorsValue); + recordBO.set("THE_UPSTREAM_INDICATORS_ID", The_upstream_indicatorsValue); + if(rowMap!=null){ + recordBO.set("THE_UPSTREAM_INDICATORS",rowMap.getString("RELATIONSHAPETEXT")); + } + } + } if (getid.equals("Downstream_target")) {//下游指标 - recordBO.set("DOWNSTREAM_TARGET", value); + if(UtilString.isNotEmpty(value)){ + String Downstream_target=value.substring(value.indexOf('"')+1,value.lastIndexOf('"')); + RowMap rowMap=DBSql.getMap("SELECT RELATIONSHAPETEXT FROM APP_ACT_COE_PAL_SHAPE_RLAT WHERE FILEID=? AND RELATIONSHAPEID=?",id,Downstream_target); + recordBO.set("DOWNSTREAM_TARGET_ID", Downstream_target); + if(rowMap!=null){ + recordBO.set("DOWNSTREAM_TARGET",rowMap.getString("RELATIONSHAPETEXT")); + } + } + } recordBO.set("PERFORMANCE_TYPE", "末级流程绩效"); @@ -694,7 +710,10 @@ public class PublishExecuteListenerInterfaceImpl extends ExecuteListener impleme recordBO.set("PUBDATE", publishDate); //回填绩效编号操作 if (getid.equals("Process_performance_indicator_Number")) { - attributesJsonArray.getJSONObject(i).put("value", "MA." + before + after +"."+ currentnumber); + if(UtilString.isNotEmpty(value)){ + attributesJsonArray.getJSONObject(i).put("value", "MA." + before + after +"."+ currentnumber); + } + } } } diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishProcessAfterCompleteEvent.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishProcessAfterCompleteEvent.java index 5a6e10e4..129ce232 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishProcessAfterCompleteEvent.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishProcessAfterCompleteEvent.java @@ -99,7 +99,7 @@ public class PublishProcessAfterCompleteEvent extends ExecuteListener implements //拿去流程数据填充绩效模型中数据属性 for (String key : elements.keySet()) { //获取当前MP绩效最新排序数值 - BO performanceNumberBO = SDK.getBOAPI().query("BO_EU_PERFORMANCE_NUMBER").addQuery("PERFORMANCE_TYPE=", "control.kpi").addQuery("PROCESS_NUMBER=", "xxxxx").detail(); + BO performanceNumberBO = SDK.getBOAPI().query("BO_EU_PERFORMANCE_NUMBER").addQuery("PERFORMANCE_TYPE=", "control.ma").addQuery("PROCESS_NUMBER=", "xxxxx").detail(); JSONObject shape1 = elements.getJSONObject(key); if ("linker".equals(shape1.getString("name"))) { @@ -149,7 +149,7 @@ public class PublishProcessAfterCompleteEvent extends ExecuteListener implements if (getid.equals("Associated_process_name")) {//关联流程名称 recordBO.set("ASSOCIATED_PROCESS_NAME", value); } - if (getid.equals("Associated_process_name")) {//流程绩效指标名称 + if (getid.equals("Name_process_performance_indicator")) {//流程绩效指标名称 recordBO.set("PERFORMANCE_INDICATOR_NAME", value); } @@ -186,12 +186,28 @@ public class PublishProcessAfterCompleteEvent extends ExecuteListener implements } if (getid.equals("The_upstream_indicators")) {//上游指标 - recordBO.set("THE_UPSTREAM_INDICATORS", value); + if(UtilString.isNotEmpty(value)){ + String The_upstream_indicatorsValue=value.substring(value.indexOf('"')+1,value.lastIndexOf('"')); + + RowMap rowMap=DBSql.getMap("SELECT RELATIONSHAPETEXT FROM APP_ACT_COE_PAL_SHAPE_RLAT WHERE FILEID=? AND RELATIONSHAPEID=?",id,The_upstream_indicatorsValue); + recordBO.set("THE_UPSTREAM_INDICATORS_ID", The_upstream_indicatorsValue); + if(rowMap!=null){ + recordBO.set("THE_UPSTREAM_INDICATORS",rowMap.getString("RELATIONSHAPETEXT")); + } + } + } if (getid.equals("Downstream_target")) {//下游指标 - recordBO.set("DOWNSTREAM_TARGET", value); - } + if(UtilString.isNotEmpty(value)){ + String Downstream_target=value.substring(value.indexOf('"')+1,value.lastIndexOf('"')); + RowMap rowMap=DBSql.getMap("SELECT RELATIONSHAPETEXT FROM APP_ACT_COE_PAL_SHAPE_RLAT WHERE FILEID=? AND RELATIONSHAPEID=?",id,Downstream_target); + recordBO.set("DOWNSTREAM_TARGET_ID", Downstream_target); + if(rowMap!=null){ + recordBO.set("DOWNSTREAM_TARGET",rowMap.getString("RELATIONSHAPETEXT")); + } + } + } recordBO.set("PERFORMANCE_TYPE", "L1L3流程绩效"); if (getid.equals("element")) {//元素