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 ad633883..ad0640aa 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 8d031772..6321c2dc 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 @@ -3203,15 +3203,28 @@ public class ProcessPublishWeb extends ActionWeb { String taskId = ""; if (model.getMethodId().contains("process.")) { taskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportPr(wsId, userId, teamId, uuid); + JSONObject object = JSONObject.parseObject(taskId); + if ("ok".equals(object.getString("result"))) { + taskId = object.getJSONObject("data").getString("taskId"); + } } else if ("data.form".equals(model.getMethodId())) { taskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportBd(wsId, userId, teamId, uuid); + JSONObject object = JSONObject.parseObject(taskId); + if ("ok".equals(object.getString("result"))) { + taskId = object.getJSONObject("data").getString("taskId"); + } } else if ("control.policy".equals(model.getMethodId())) { taskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportZd(wsId, userId, teamId, uuid); + JSONObject object = JSONObject.parseObject(taskId); + if ("ok".equals(object.getString("result"))) { + taskId = object.getJSONObject("data").getString("taskId"); + } } return taskId; } + /** * 对未创建手册的流程进行创建流程手册 */ diff --git a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js index 54be8cfb..5905f5ca 100644 --- a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js +++ b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js @@ -15,6 +15,7 @@ var stopTemp; var treeCheckedNewArr = []; var treeCheckedChangeArr = []; var treeCheckedStopArr = []; +var taskArr=[]; // 统一中文变量 var varDutyDept = "责任部门"; var varDutyUser = "责任人"; @@ -228,9 +229,13 @@ function initHtml() { newHtml += '
'; newHtml += ''; newHtml += '
'; - newHtml += ''; - // newHtml += ''; - newHtml += ''; + + if($("#userTaskDefId").val()=='obj_c9e5a2e257f00001e2a375d01f601518'){ + newHtml += ''; + // newHtml += ''; + newHtml += ''; + } + newHtml += '
'; newHtml += '
'; newHtml += ''; @@ -254,9 +259,11 @@ function initHtml() { changeHtml += '
'; changeHtml += ''; changeHtml += '
'; + if($("#userTaskDefId").val()=='obj_c9e5a2e257f00001e2a375d01f601518'){ changeHtml += ''; // changeHtml += ''; changeHtml += ''; + } changeHtml += '
'; changeHtml += '
'; changeHtml += '
'; @@ -282,9 +289,11 @@ function initHtml() { stopHtml += '
'; stopHtml += ''; stopHtml += '
'; - stopHtml += ''; - // stopHtml += ''; - stopHtml += ''; + if($("#userTaskDefId").val()=='obj_c9e5a2e257f00001e2a375d01f601518') { + stopHtml += ''; + // stopHtml += ''; + stopHtml += ''; + } stopHtml += '
'; stopHtml += '
'; stopHtml += '
'; @@ -509,12 +518,14 @@ function showlist(data, type, pageNumber, start){ } // 加载数据 var html = ''; + //var appendTask=""; for (var i = 0, s = start; i < pageLimit; i++, s++) { var curr; if ((curr = data[s - 1]) != undefined) { + //appendTask+=curr.taskId+','; var fileName = curr.publishFileName + ' V' + curr.fileVersion; var outputName = getOutputName(curr.category, curr.methodId); - var reportName = '' + fileName + "-" + outputName + ''; + var reportName = '' + fileName + "-" + outputName + ''; var quickCreate = "立即创建"; var processNumber = ''; if(curr.processNumber != undefined){ @@ -535,9 +546,19 @@ function showlist(data, type, pageNumber, start){ //html += ''; html += ''; html += ''; + } + + } + //appendTask=appendTask.substring(0,appendTask.length-1); $('#publish_new_tbody').empty().html(html); + + /*var taskData=appendTask.split(","); + for(var i=0;i oldModelList = dao.getModelListByFileId(sourceId); for (DesignerShapeRelationModel oldModel : oldModelList) { - //如果关联角色图,则同步复制角色图关联关系 + //如果关联角色图,则同步复制角色图关联关系,由于角色图规定为本流程使用,所以获取一次 String methodIds = ""; if (oldModel.getAttrId().equals("role")) { PALRepository coeProcessLevel = CoeProcessLevelDaoFacotory.createCoeProcessLevel(); @@ -10523,8 +10523,10 @@ public String deleteReply(String replyid, String messageid) { SDK.getLogAPI().consoleErr("复制文件[" + model.getName() + "][" + model.getId() + "]失败," + moveRo.getString("msg")); return ResponseObject.newErrResponse(moveRo.getString("msg")).toString(); } + break; } + } } @@ -10586,6 +10588,7 @@ public String deleteReply(String replyid, String messageid) { } + break; } }
'+ processNumber +'