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 38a6a979..cb10939f 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 @@ -2873,9 +2873,7 @@ public class ProcessPublishWeb extends ActionWeb { params); return ros; } - - - + /************ 批量流程发布 *****************/ /** @@ -2911,7 +2909,7 @@ public class ProcessPublishWeb extends ActionWeb { boolean isEnd = publish.isEnd(); ro.put("isEnd", isEnd); String bindId = publish.getBindId(); - List newList = SDK.getBOAPI().query("BO_ACT_COE_PUBLISH_N").addQuery("BINDID=", bindId).list(); + List newList = SDK.getBOAPI().query("BO_ACT_COE_PUBLISH_N").addQuery("BINDID=", bindId).orderByCreated().asc().list(); if (!isEmpty(newList)) for (int i = 0; i < newList.size(); i++) { JSONObject obj = new JSONObject(); @@ -2984,7 +2982,6 @@ public class ProcessPublishWeb extends ActionWeb { jb.put("openUrl", openUrl); js.add(jb.toJSONString()); } - } obj.put("upfileId", js); } else { @@ -2996,7 +2993,7 @@ public class ProcessPublishWeb extends ActionWeb { newArr.add(obj); } } - List changeList = SDK.getBOAPI().query("BO_ACT_COE_PUBLISH_C").addQuery("BINDID=", bindId).list(); + List changeList = SDK.getBOAPI().query("BO_ACT_COE_PUBLISH_C").addQuery("BINDID=", bindId).orderByCreated().asc().list(); if (!isEmpty(changeList)) for (int j = 0; j < changeList.size(); j++) { JSONObject obj = new JSONObject(); @@ -3120,7 +3117,7 @@ public class ProcessPublishWeb extends ActionWeb { changeArr.add(obj); } } - List stopList = SDK.getBOAPI().query("BO_ACT_COE_PUBLISH_S").addQuery("BINDID=", bindId).list(); + List stopList = SDK.getBOAPI().query("BO_ACT_COE_PUBLISH_S").addQuery("BINDID=", bindId).orderByCreated().asc().list(); if (!isEmpty(stopList)) for (int i = 0; i < stopList.size(); i++) { JSONObject obj = new JSONObject(); diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/OutputDCFileProcessor.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/OutputDCFileProcessor.java index 11c2526a..41d89684 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/OutputDCFileProcessor.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/OutputDCFileProcessor.java @@ -34,7 +34,6 @@ public class OutputDCFileProcessor extends AbstFileProcessor implements FileProc if (SDK.getAppAPI().getPropertyBooleanValue("com.actionsoft.apps.coe.pal", "IS_RECORD_OP_LOG", false)) { CoEOpLogAPI.auditOkOp(_uc, "PAL应用中心", "download", "下载报告手册文档"); } - return dcContext.getDownloadURL(); } else { return ""; diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java index 600b00b8..3379d727 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java @@ -307,10 +307,8 @@ public class ProcessEndAfterEvent extends ExecuteListener implements ExecuteList OutputTaskModel model = new OutputTask().getTaskReportById(rowMap.getString("TASKID")); if (model != null) { - System.out.println(",pdel============" + model); - System.out.println("123313123123123==========" + model.getProfileId()); + //System.out.println(",pdel============" + model); OutputAppProfile appProfile = OutputAppManager.getProfile(model.getProfileId()); - System.out.println("dajadfas======" + appProfile); if (appProfile == null) { throw new AWSException("Not Find OutputAppProfile! profileId=" + model.getProfileId()); } @@ -512,8 +510,7 @@ public class ProcessEndAfterEvent extends ExecuteListener implements ExecuteList * @param fileid * @return */ - public boolean execute(ProcessExecutionContext processExecutionContext, String fileCreateName, String fileName, - String fileurl, String readingScope_org, String isFullCompany, String fileCreateDate, + public boolean execute(ProcessExecutionContext processExecutionContext, String fileCreateName, String fileName,String fileurl, String readingScope_org, String isFullCompany, String fileCreateDate, String relationProcessinstId, String readingScope_post, String readingScope_level, String fileid) { // 调用App String sourceAppId = processExecutionContext.getProcessInstance().getAppId(); @@ -557,8 +554,8 @@ public class ProcessEndAfterEvent extends ExecuteListener implements ExecuteList * @param knwlId * @return */ - public boolean AddKnwlAC(ProcessExecutionContext processExecutionContext, JSONArray jsonArray, String sid, - String knwlId) { + public boolean AddKnwlAC(ProcessExecutionContext processExecutionContext, JSONArray jsonArray, String sid,String knwlId) { + // 调用App String sourceAppId = processExecutionContext.getProcessInstance().getAppId(); // aslp服务地址