From 7876ab6475133020f98e728a7b3fef7c1d729ac8 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Wed, 3 Apr 2019 18:14:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?hql=E5=B0=81=E8=A3=85=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java | 1 - .../java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 11 ++++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java index 94ed7aa..c052dcc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -125,7 +125,6 @@ public class DdlPackBean { if(orderByStr != null){ sb.append(orderByStr); } - System.out.println("===" + sb.toString()); return sb.toString(); } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index cecaee4..f74f02f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import org.apache.commons.lang3.StringUtils; import java.text.SimpleDateFormat; +import java.util.Arrays; import java.util.Date; import java.util.List; @@ -338,8 +339,8 @@ public class DdlPreparedPack { * @param columnName * @param packBean */ - public static void getInPack(String data, String columnName, DdlPackBean packBean) { - if (data != null && data.trim().length() > 0) { + public static void getInPack(Object data, String columnName, DdlPackBean packBean) { + if (data != null) { packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data); } } @@ -364,9 +365,9 @@ public class DdlPreparedPack { * @param columnName * @param packBean */ - public static void getInPackString(Object[] data, String columnName, DdlPackBean packBean) { + public static void getInPackArray(Object[] data, String columnName, DdlPackBean packBean) { if (data != null && data.length > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data); + packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", Arrays.asList(data)); } } @@ -377,7 +378,7 @@ public class DdlPreparedPack { * @param columnName * @param packBean */ - public static void getInPackString(List data, String columnName, DdlPackBean packBean) { + public static void getInPackList(List data, String columnName, DdlPackBean packBean) { if (data != null && data.size() > 0) { packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data); } From 0863e49b1aab69ae89f84cb29f5528d6e11be1b5 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 3 Apr 2019 19:33:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=98=8E=E7=BB=86=E9=94=99=E8=AF=AF=EF=BC=9A?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95=E6=94=B9?= =?UTF-8?q?=E7=89=88=20=E5=8D=95=E6=8D=AE=E4=BB=BB=E5=8A=A1=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=8A=B6=E6=80=81=E9=BB=98=E8=AE=A4=EF=BC=9A10?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=20=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=9A=E7=A7=BB=E5=8A=A8=E5=8D=95=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E5=AE=9A=E6=9C=89=E5=85=B3=E8=81=94=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E4=BB=A3=E7=A0=81=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 8cdee66..1c58e3c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -123,12 +123,7 @@ public class WmsHqlPack { */ public static DdlPackBean packWmsOrderDetailsByOrderNos(String colName, List orderNos) { DdlPackBean packBean = new DdlPackBean(); - StringBuffer orderNoStr = new StringBuffer(); - for (int i = 0; i < orderNos.size(); i++) { - orderNoStr.append("'" + orderNos.get(i) + "',"); - } - orderNoStr.deleteCharAt(orderNoStr.length() - 1); - DdlPreparedPack.getInPack(orderNoStr.toString(), "orderNo", packBean); + DdlPreparedPack.getInPack(orderNos, "orderNo", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); DdlPreparedPack.getOrderByPack(