diff --git a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar index e3d1e216..0a83239b 100644 Binary files a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar and b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar differ diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java index 28108020..a3f05eb3 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java @@ -1187,12 +1187,12 @@ public class CoEPALController { * @return */ @Mapping("com.actionsoft.apps.coe.pal_outputreport_output_downloadZipfile") - public String COEPALOUTPUTREPORTOutputProcessDownloadZipFILE(UserContext me, RequestParams params) throws Exception { + public String COEPALOUTPUTREPORTOutputProcessDownloadZipFILE(UserContext me, RequestParams params,String methodId) throws Exception { UpfileWeb web = new UpfileWeb(me); String splitId = params.get("splitId"); String toolbarname=params.get("toolbarname"); String taskId=params.get("taskIdParams"); - return web.readZipFileDownLoad(splitId,toolbarname,taskId); + return web.readZipFileDownLoad(splitId,toolbarname,taskId,methodId); } diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/manage/publish/dao/PublishListHistory.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/manage/publish/dao/PublishListHistory.java index 6cf85dd3..f17310a2 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/manage/publish/dao/PublishListHistory.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/manage/publish/dao/PublishListHistory.java @@ -452,14 +452,17 @@ public final class PublishListHistory extends DaoObject * @return */ public String getLastPublishTaskIdByModelId(String repositoryId) { + System.out.println("repositoryId==============="+repositoryId); //String sql = "SELECT pl.TASKID FROM APP_ACT_COE_PAL_PUBLISH p, APP_ACT_COE_PAL_PUBLISH_LIST pl WHERE pl.pid = p.id AND pl.palrepositoryid = ? ORDER BY publishdate DESC"; - String sql="SELECT * FROM (SELECT TASKID FROM BO_ACT_COE_PUBLISH_N WHERE PUBLISHFILEID=? ORDER BY CREATEDATE DESC) WHERE ROWNUM=1"; + String sql="SELECT TASKID FROM (SELECT TASKID FROM BO_ACT_COE_PUBLISH_N WHERE PUBLISHFILEID=? ORDER BY CREATEDATE DESC) WHERE ROWNUM=1"; String taskId = DBSql.getObject(sql, new RowMapper() { @Override public String mapRow(ResultSet rs, int arg1) throws SQLException { return rs.getString(1); } }, new Object[] { repositoryId }); + + System.out.println("taskID====================="+taskId); return taskId; } diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java index 0046e578..508c68ba 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java @@ -488,7 +488,7 @@ public class UpfileWeb extends ActionWeb { * @return * @author zhaolei */ - public String readZipFileDownLoad(String splitId,String toolbarname,String taskId) throws Exception { + public String readZipFileDownLoad(String splitId,String toolbarname,String taskId,String methodId) throws Exception { UserContext me = super.getContext(); ResponseObject ro = ResponseObject.newOkResponse(); UpFileDao upfileDao = new UpFileDao(); @@ -534,6 +534,8 @@ public class UpfileWeb extends ActionWeb { } + + //流程手册打包 if (UtilString.isNotEmpty(taskId)) { OutputTaskModel model = new OutputTask().getTaskReportById(taskId); @@ -553,7 +555,14 @@ public class UpfileWeb extends ActionWeb { if (docFile == null) { return ResponseObject.newErrResponse("没有找到文件").toString(); } - String sourceAppId = "com.awspaas.user.apps.coe.pal.output.bd"; + + String sourceAppId = null; + if (methodId.equals("data.form")) { + sourceAppId = "com.awspaas.user.apps.coe.pal.output.bd"; + } + if (methodId.indexOf("process.") > -1) { + sourceAppId="com.actionsoft.apps.coe.pal.output.pr"; + } String filename = docFile.getName(); DCContext sourceDc = new DCContext(_uc, DCProfileManager.getDCProfile(sourceAppId, "output"), sourceAppId, model.getWsId(), taskId, filename); 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 fe78e71d..664b266a 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 @@ -2372,7 +2372,7 @@ public class CoeProcessLevelUtil { */ public static String getLastPublishTaskIdByModelId(String repositoryId) { //String sql = "SELECT pl.TASKID FROM APP_ACT_COE_PAL_PUBLISH p, APP_ACT_COE_PAL_PUBLISH_LIST pl WHERE pl.pid = p.id AND pl.palrepositoryid = ? ORDER BY publishdate DESC"; - String sql="SELECT * FROM (SELECT TASKID FROM BO_ACT_COE_PUBLISH_N WHERE PUBLISHFILEID=? ORDER BY CREATEDATE DESC) WHERE ROWNUM=1"; + String sql="SELECT TASKID FROM (SELECT TASKID FROM BO_ACT_COE_PUBLISH_N WHERE PUBLISHFILEID=? ORDER BY CREATEDATE DESC) WHERE ROWNUM=1"; String taskId = DBSql.getObject(sql, new RowMapper() { @Override public String mapRow(ResultSet rs, int arg1) throws SQLException { diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js index c155c6fb..eb0734d7 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js @@ -1680,7 +1680,8 @@ function downloadZipFile(splitId,toolbarname) { data : { splitId : splitId, toolbarname:toolbarname, - taskIdParams:taskId + taskIdParams:taskId, + methodId:methodId }, success : function(msg) { if (msg.result == "ok") {