From e9e7d37fa76542eb26ddca69b46a3c0e9ff9f978 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 21 Nov 2018 17:37:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=95=B0=E6=8D=AE=E5=BA=93=E7=BC=96=E7=A0=81?= 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e5b9484..e8a753c 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 @@ -678,7 +678,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); // 来源单据类型 - HqlPack.getStringLikerPack(wmsSnPrint.getRefType(), "refType", result); + HqlPack.getStringEqualPack(wmsSnPrint.getRefType(), "refType", result); // 来源单据号 HqlPack.getStringEqualPack(wmsSnPrint.getRefNo(), "refNo", result); // 打印机 From 855d9abef837bd449dee5af200f9afca62aef31a Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 21 Nov 2018 19:25:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81=E5=A4=8D=E6=9D=82=E6=A0=91=20?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 1 + .../i3plus/pojo/base/enumutil/ModelEnumUtil.java | 76 ++++++++++++++++++++++ .../pojo/model/platform/CommonTreeModel.java | 23 +++++++ .../i3plus/pojo/platform/bean/SysOrganize.java | 1 + .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 2 + 5 files changed, 103 insertions(+) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ModelEnumUtil.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/CommonTreeModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 3edc60e..7714b9d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -592,4 +592,5 @@ public class CommonEnumUtil { return tmp; } } + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ModelEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ModelEnumUtil.java new file mode 100644 index 0000000..17ecec8 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ModelEnumUtil.java @@ -0,0 +1,76 @@ +package cn.estsh.i3plus.pojo.base.enumutil; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * @Description : Model Pojo 枚举 + * @Reference : + * @Author : Adair Peng + * @CreateDate : 2018-11-21 15:50 + * @Modify: + **/ +public class ModelEnumUtil { + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum COMMON_TREE_TYPE{ + + TYPE_ORGANIZE(1,"组织","SysOrganize"), + TYPE_DEPARTMENT(2,"部门","SysDepartment"), + ; + + private int value; + private String name; + private String description; + + COMMON_TREE_TYPE() { + } + + COMMON_TREE_TYPE(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getName() { + return name; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].name; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/CommonTreeModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/CommonTreeModel.java new file mode 100644 index 0000000..8c963a4 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/CommonTreeModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; +/** + * @Description : 复杂Tree + * @Reference : + * @Author : Adair Peng + * @CreateDate : 2018-11-21 15:50 + * @Modify: + **/ +@Data +public class CommonTreeModel { + + private BaseBean bean; + + private Integer beanType; + + private List childList = new ArrayList<>(); +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java index 0f51341..c6b1131 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java @@ -68,4 +68,5 @@ public class SysOrganize extends BaseBean { @ApiParam(value ="子集列表") private transient List childList; + } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index cfb2876..846f473 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -125,6 +125,7 @@ public class CoreHqlPack { // 查询参数封装 HqlPack.getNumEqualPack(department.getParentId(),"parentId",result); + HqlPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result); HqlPack.getStringLikerPack(department.getName(),"name",result); HqlPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result); @@ -346,6 +347,7 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); // And + HqlPack.getNumEqualPack(userInfo.getOrganizeId(),"organizeId",result); HqlPack.getNumEqualPack(userInfo.getDepartmentId(),"departmentId",result); HqlPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result); HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result);