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 e87a96ae..7752fd85 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 8bafba50..881fc99f 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 @@ -2540,8 +2540,8 @@ public class CoEPALController { * by zhaolei */ @Mapping("com.actionsoft.apps.coe.pal_outputreport_output_process_download") - public String COEPALOUTPUTREPORTOutputProcessDownload(UserContext me, String taskId) { - return PALRepositoryQueryAPIManager.getInstance().outputReportDownload(me, taskId); + public String COEPALOUTPUTREPORTOutputProcessDownload(UserContext me, String taskId,String ruuid) { + return PALRepositoryQueryAPIManager.getInstance().outputReportDownload(me, taskId,ruuid); } diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java index 889299de..798af2d7 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java @@ -3215,7 +3215,7 @@ public class PALRepositoryQueryAPIManager { * @param taskId * @return */ - public String outputReportDownload(UserContext _uc, String taskId) { + public String outputReportDownload(UserContext _uc, String taskId,String ruuid) { OutputTaskModel model = new OutputTask().getTaskReportById(taskId); ResponseObject result = ResponseObject.newOkResponse(); if (model != null) { @@ -3235,7 +3235,7 @@ public class PALRepositoryQueryAPIManager { return ResponseObject.newErrResponse("没有找到文件").toString(); } - String plId = DBSql.getString("SELECT PALREPOSITORYID FROM app_act_coe_pal_publish_list WHERE TASKID ='"+taskId+"'"); + /*String plId = DBSql.getString("SELECT PALREPOSITORYID FROM app_act_coe_pal_publish_list WHERE TASKID ='"+taskId+"'"); if(UtilString.isNotEmpty(plId)) { PALRepositoryModel plmodel = PALRepositoryCache.getCache().get(plId); if(plmodel!=null) { @@ -3252,7 +3252,24 @@ public class PALRepositoryQueryAPIManager { result.put("url",downUrl); } - } + }*/ + + PALRepositoryModel plmodel = PALRepositoryCache.getCache().get(ruuid); + if(plmodel!=null) { + String sourceAppId = "com.actionsoft.apps.coe.pal.output.pr"; + String methodId = plmodel.getMethodId(); + if(methodId.contains("control")) { + sourceAppId = "com.awspaas.user.apps.coe.pal.output.zd"; + }else if(methodId.contains("data")) { + sourceAppId = "com.awspaas.user.apps.coe.pal.output.bd"; + } + String filename = docFile.getName(); + DCContext sourceDc = new DCContext(_uc, DCProfileManager.getDCProfile(sourceAppId, "output"), sourceAppId, model.getWsId(), taskId, filename); + String downUrl=SDK.getConfAPI().getPortalUrl() + "/r/" + sourceDc.getDownloadURL().replace("./", ""); + result.put("url",downUrl); + + } + } }else{ diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/queryPost.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/queryPost.java index a1c23be6..143bb435 100644 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/queryPost.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/queryPost.java @@ -21,9 +21,13 @@ public class queryPost implements IJob { List rowMaps=DBSql.getMaps("SELECT * FROM APP_ACT_COE_PAL_SHAPE_RLAT WHERE RELATIONFILEID=?",wsIdParams); - for(int i=0;i0){ + for(int i=0;i 0) { - + var fileTile=""; + if(ele.category=="data_form"){ + fileTile="表单/模板:"; + }else{ + fileTile="节点附件:"; + } t += '
'; - t +=''+'节点附件:'+''+ele.text; + t +=''+fileTile+''+ele.text; for(var i = 0; i < processShape.length; i++) { t += ''; t +='';