From b67978139768675e57ebc23f89b8bed86c07ec8d Mon Sep 17 00:00:00 2001 From: lihongyu <504404568@qq.com> Date: Tue, 22 Nov 2022 00:25:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E9=98=85=E8=A7=88=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pal/repository/upfile/web/UpfileWeb.java | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) 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 3ae1e599..134d54bb 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 @@ -692,14 +692,23 @@ public class UpfileWeb extends ActionWeb { public String coePALProcessManualLogData(String ruuid) throws Exception { ResponseObject ro = ResponseObject.newOkResponse(); - BO outputreportBO=SDK.getBOAPI().query("BO_EU_PAL_OUTPUTREPORT").addQuery("PLID=",ruuid).addQuery("RESULT=","手册转换成功！").detail(); - //System.out.println("outputreportBO========="+outputreportBO); - if(outputreportBO!=null){ - Map map=new HashMap<>(); - map.put("taskId",outputreportBO.getString("TASKID")); - map.put("plname",outputreportBO.getString("PLNAME")); - ro.put("resultMap",map); + Map map=new HashMap<>(); + if(UtilString.isNotEmpty(ruuid)) { + BO outputreportBO=SDK.getBOAPI().query("BO_EU_PAL_OUTPUTREPORT").addQuery("PLID=",ruuid).addQuery("FILEURL is not null",null).detail(); + //System.out.println("outputreportBO========="+outputreportBO); + if(outputreportBO!=null){ + map.put("taskId",outputreportBO.getString("TASKID")); + map.put("plname",outputreportBO.getString("PLNAME")); + }else { + 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 = '"+ruuid+"' ORDER BY publishdate DESC"; + String taskId = DBSql.getString(sql); + String sqlr = "SELECT PLNAME FROM APP_ACT_COE_PAL_REPOSITORY WHERE ID = '"+ruuid+"'"; + String name = DBSql.getString(sqlr); + map.put("taskId",taskId); + map.put("plname",name); + } } + ro.put("resultMap",map); return ro.toString(); }