From 21f77a0e7b9b30247c96c66a8e9ef10f03da2fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 28 Sep 2020 18:55:19 +0800 Subject: [PATCH] =?UTF-8?q?fix(softswitch):ftp=E9=80=82=E9=85=8D=E5=99=A8?= =?UTF-8?q?=E5=B9=B6=E5=8F=91=E8=AF=BB=E5=8F=96=E6=96=87=E4=BB=B6=E9=87=8D?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java | 2 +- .../java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java index 9e98bc4..7d4b198 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java @@ -95,7 +95,7 @@ public class BsSuitFile extends BaseBean { this.setFolderPath("/"); this.setFileName(ftpPathInfo); }else{ - this.setFolderPath(ftpPathInfo.substring(0,pathIdx+1)); + this.setFolderPath(ftpPathInfo.substring(0,pathIdx)); this.setFileName(ftpPathInfo.substring(pathIdx + 1)); } } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index e163e9e..2d9e16d 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -387,6 +387,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getStringLikerPack(bsSuitFile.getSuitCaseCode(),"suitCaseCode",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitFile.getSuitCaseId(), "suitCaseId", ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitFile.getFileName(), "fileName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitFile.getFolderPath(), "folderPath", ddlPackBean); DdlPreparedPack.timeBuilder(bsSuitFile.getSuitDateTime(), "suitDateTime", ddlPackBean, false, true); ddlPackBean.setOrderByStr(bsSuitFile.orderBy());