yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改阅览文字显示/修改下载功能/pal打包

Browse Source
This commit is contained in:
zhal 2022-10-08 15:06:28 +08:00
parent d18abe4238
commit 5dc9b4c98c
5 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
View File

Binary file not shown.

4
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java
View File

@ -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);
}

23
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java
View File

@ -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{

11
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/queryPost.java
View File

@ -21,9 +21,13 @@ public class queryPost implements IJob {
List<RowMap> rowMaps=DBSql.getMaps("SELECT * FROM APP_ACT_COE_PAL_SHAPE_RLAT WHERE RELATIONFILEID=?",wsIdParams);
for(int i=0;i<rowMaps.size();i++){
//FILEID SHAPETEXT SHAPEID
System.out.println("存在关联关系有FILEID========"+rowMaps.get(i).getString("FILEID")+" "+"SHAPETEXT="+rowMaps.get(i).getString("SHAPETEXT")+" "+"SHAPEID="+rowMaps.get(i).getString("SHAPEID"));
if(rowMaps.size()>0){
for(int i=0;i<rowMaps.size();i++){
//FILEID SHAPETEXT SHAPEID
System.out.println(wsIdParams+"存在关联关系有FILEID========"+rowMaps.get(i).getString("FILEID")+" "+"SHAPETEXT="+rowMaps.get(i).getString("SHAPETEXT")+" "+"SHAPEID="+rowMaps.get(i).getString("SHAPEID"));
}
}else{
System.out.println(wsIdParams+"未查询到关联项");
}
@ -31,5 +35,6 @@ public class queryPost implements IJob {
}
}

18
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js
View File

@ -1618,9 +1618,9 @@ function changeArributeByShape() {
function ProcessManual(obj) {
var manualName;
if(methodId=="data.form"){
manualName="表单手册 :";
manualName="表单/模板封面 :";
}else if (methodId=="process.epc"){
manualName="EPC手册 :";
manualName="流程文件 :";
}else if (methodId=="process.bpmn2"){
manualName="BPMN手册 :";
}else if (methodId=="process.flowchart"){
@ -1632,7 +1632,7 @@ function ProcessManual(obj) {
}else if (methodId=="itsystem.normal"){
manualName="IT系统手册 :";
}else if (methodId=="control.policy"){
manualName="制度手册 :";
manualName="制度文件 :";
}else if (methodId=="control.risk"){
manualName="风险控制手册 :";
}else if(methodId=="control.kpi"){
@ -1711,7 +1711,8 @@ function downloadProcessFile(taskId) {
url : "./jd?sid=" + sid
+ "&cmd=com.actionsoft.apps.coe.pal_outputreport_output_process_download",
data : {
taskId : taskId
taskId : taskId,
ruuid:ruuid
},
success : function(msg) {
if (msg.result == "ok") {
@ -1800,9 +1801,14 @@ function initUpfileData(obj) {
}
var processShape = upfileData[ele.id];
if(processShape != null && processShape.length > 0) {
var fileTile="";
if(ele.category=="data_form"){
fileTile="表单/模板:";
}else{
fileTile="节点附件:";
}
t += '<div>';
t +='<strong>'+'节点附件:'+'</strong>'+ele.text;
t +='<strong>'+fileTile+'</strong>'+ele.text;
for(var i = 0; i < processShape.length; i++) {
t += '<table name="' + ele.id + '" class="awsui-table">';
t +='<tbody>';