From 07c227769da1249be3dd13f8e4319c8a585d7e41 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Thu, 4 Apr 2019 09:51:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index 1225c80..1c75712 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -56,7 +56,7 @@ public class WmsLocatePart extends BaseBean{ @ApiParam(value = "是否生成领料单", example = "2") private Integer isGeneratePicklist; - public Double getMix() { + public Double getMin() { return this.min == null ? 0 : this.min; } From 2830bd03769d06168ada9d3cebbaddf0e54e8f39 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Thu, 4 Apr 2019 11:30:14 +0800 Subject: [PATCH 2/4] =?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 --- .../estsh/i3plus/pojo/base/bean/DdlPackBean.java | 4 +-- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 34 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 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 c052dcc..8f6617b 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 @@ -41,13 +41,11 @@ public class DdlPackBean { public DdlPackBean(){ this.isHql = true; - sb = new StringBuilder(); whereAppend = new StringBuilder(); } public DdlPackBean(boolean isHql){ this.isHql = isHql; - sb = new StringBuilder(); whereAppend = new StringBuilder(); } @@ -116,6 +114,7 @@ public class DdlPackBean { * @return */ public String getPackedHqlAll(){ + sb = new StringBuilder(); if(hqlAppend != null){ sb.append(hqlAppend); } @@ -133,6 +132,7 @@ public class DdlPackBean { * @return */ public String getPackedHql(){ + sb = new StringBuilder(); if(whereAppend != null){ sb.append(whereAppend); } 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 c3faf6d..aab262f 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 @@ -400,6 +400,40 @@ public class CoreHqlPack { } /** + * 账号复杂查询 + * @param user + * @return + */ + public static DdlPackBean packDdlSysUser(SysUser user){ + DdlPackBean ddlPack = new DdlPackBean(); + + // And X = X + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPack); + DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",ddlPack); + DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",ddlPack); + + if(user.getRoleIdList() != null){ + DdlPreparedPack.getInPack(user.getRoleIdList(),"id",ddlPack); + } + + if(user.getDepartmentIdList() != null){ + DdlPreparedPack.getInPack(user.getDepartmentIdList(),"id",ddlPack); + } + + // And Like % % + DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",ddlPack); + DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",ddlPack); + DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",ddlPack); + DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",ddlPack); + + // 添加默认排序 + DdlPreparedPack.getOrderDefault(user); + DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"createDatetime"}, ddlPack); + + return ddlPack; + } + + /** * 查询字典代码是否重复 * @param dictionary * @return From f0b666b502d790011edd1813e51d0c14144624dc Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 4 Apr 2019 11:43:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java | 2 -- 1 file changed, 2 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 8f6617b..025dfe9 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 @@ -1,7 +1,5 @@ package cn.estsh.i3plus.pojo.base.bean; -import javafx.scene.text.Font; - import java.util.HashMap; /** From 6971fdbf60b602ddb2db5e4f35cd6984fbb6e1a3 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Thu, 4 Apr 2019 14:56:47 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A0=E9=99=A4json=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=8C=96not=5Fempty=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 9098f50..6f6fcb2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -25,7 +25,7 @@ import java.io.Serializable; @Entity //以子类table为准 @javax.persistence.Inheritance(strategy=InheritanceType.TABLE_PER_CLASS) -@JsonInclude(value = JsonInclude.Include.NON_EMPTY) //""或null属性不参加序列转换 +//@JsonInclude(value = JsonInclude.Include.NON_EMPTY) //""或null属性不参加序列转换 public abstract class BaseBean implements Serializable { private static final long serialVersionUID = 1L;