From 0988c1ad26d43c4b1696c8878ef66e27fd88c58b Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 19 Dec 2018 10:46:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=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/tool/HqlPack.java | 13 +++++++++++++ .../java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java | 2 +- .../java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java | 4 ++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java index fa95759..6d4f83e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java @@ -393,6 +393,19 @@ public class HqlPack { } /** + * 封装in查询语句 + * @param data + * @param columnName + * @param result + */ + public static void getOrInPack(String data,String columnName, StringBuffer result){ + if (data!=null&&data.trim().length()>0) { + data = getSafeParam(data); + result.append(" or model."+columnName+" in ( "+ data+ " )"); + } + } + + /** * 封装in String查询语句 * @param data * @param columnName diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index 61b930a..1aaf49c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -63,7 +63,7 @@ public class SysMenu extends BaseBean { private String menuGrade; @Column(name="MENU_SORT") - @ApiParam(value ="资源排序", example = "1") + @ApiParam(value ="资源排序", example = "0") private String menuSort; @Column(name="MENU_URL") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 22aa6ae..3a9e23b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -100,4 +100,8 @@ public class SysUser extends BaseBean { @Transient @ApiParam(value ="用户所有权限信息") private List menuList; + + @Transient + @ApiParam(value ="用户所有权限信息树数据") + private List menuListTree; } From 9646f1b3d3dde855df618e12e56b11ad97d222c1 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Wed, 19 Dec 2018 13:07:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B92858?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 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 a59084a..90f6eba 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 @@ -181,15 +181,15 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); - if (StringUtils.isNotBlank(wmsIbCheckPlan.getStartDateStart()) && StringUtils.isNotBlank(wmsIbCheckPlan.getStartDateEnd())) { + getStringBuilderPack(wmsIbCheckPlan, result); + + if(wmsIbCheckPlan.getStartDateStart() != null || wmsIbCheckPlan.getStartDateEnd() != null) { HqlPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false); } - if (StringUtils.isNotBlank(wmsIbCheckPlan.getEndDateStart()) && StringUtils.isNotBlank(wmsIbCheckPlan.getEndDateEnd())) { + if(wmsIbCheckPlan.getEndDateStart() != null || wmsIbCheckPlan.getEndDateEnd() != null) { HqlPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false); } - getStringBuilderPack(wmsIbCheckPlan, result); - return result.toString(); } @@ -1159,12 +1159,10 @@ public class WmsHqlPack { public static String packHqlWmsActionLog(WmsActionLog wmsActionLog) { StringBuffer result = new StringBuffer(); - if (StringUtils.isNotBlank(wmsActionLog.getStartTimeStart()) && - StringUtils.isNotBlank(wmsActionLog.getStartTimeEnd())) { + if (wmsActionLog.getStartTimeStart() != null || wmsActionLog.getStartTimeEnd() != null) { HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(),wmsActionLog.getStartTimeEnd(), "startTime", result, true); - } else if (StringUtils.isNotBlank(wmsActionLog.getEndTimeStart()) && - StringUtils.isNotBlank(wmsActionLog.getEndTimeEnd())) { + } else if (wmsActionLog.getEndTimeStart() != null || wmsActionLog.getEndTimeEnd() != null) { HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(),wmsActionLog.getEndTimeEnd(), "endTime", result, true); } From 586454a2884172b7058694385820ce295cae212a Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Wed, 19 Dec 2018 14:40:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 5 ++++- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 698347f..dc89b72 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -36,9 +36,12 @@ public class WmsLocate extends BaseBean { @ApiParam(value ="库位名称") private String locateName; + /** + * 1=收货库,10=基础库,20=机动库,30=组合库,40=线边库,50=NC库 + */ @Column(name="LOCATE_TYPE") @ApiParam(value ="库位类型") - private String locateType; + private Integer locateType; @Column(name="WH_NO") @ApiParam(value ="仓库代码") 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 90f6eba..55b23ed 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 @@ -224,7 +224,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsLocate.getLocateNo(), "locateNo", result); HqlPack.getStringLikerPack(wmsLocate.getLocateName(), "locateName", result); - HqlPack.getStringEqualPack(wmsLocate.getLocateType(), "locateType", result); + HqlPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result); HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result); HqlPack.getNumEqualPack(wmsLocate.getIsEmpty(), "isEmpty", result);