From c4510fb121e4727bc4e300c822f80c4cf9a86869 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Wed, 13 May 2020 11:56:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?BUG=20#8485,=E4=BF=AE=E5=A4=8D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90-=E6=9F=A5=E8=AF=A2=E5=90=AF?= =?UTF-8?q?=E7=94=A8=E7=A6=81=E7=94=A8=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java | 16 ++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 7 ++++++- 3 files changed, 30 insertions(+), 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 e85f93d..f51ab6a 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 @@ -141,6 +141,14 @@ public abstract class BaseBean implements Serializable { //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc public transient Integer ascOrDesc = 1; + public int getIsValidVal() { + return this.isValid == null ? 0 : this.isValid.intValue(); + } + + public int getIsDeletedVal() { + return this.isDeleted == null ? 0 : this.isDeleted.intValue(); + } + //排序方式 public String orderBy(){ String result = ""; 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 c397de1..0abeacf 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 @@ -68,6 +68,22 @@ public class DdlPackBean { return result; } + /** + * 查询指定组织、指定是否有效的数据 + * @param organizeCode + * @param isValid + * @return + */ + public static DdlPackBean getDdlPackBean(String organizeCode, int isValid){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + DdlPreparedPack.getNumEqualPack(isValid,"isValid",result); + DdlPreparedPack.getNumEqualPack(organizeCode,"organizeCode",result); + + return result; + } + public static DdlPackBean getDdlPackBean(){ DdlPackBean result = new DdlPackBean(); diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index de193d7..de26317 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2700,7 +2700,12 @@ public class MesHqlPack { } public static DdlPackBean getDataAuthCondition(MesDataAuth dataAuth, String organizeCode) { - DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPackBean packBean; + if(dataAuth.getIsValidVal() == 0) { + packBean = DdlPackBean.getDdlPackBean(organizeCode); + } else { + packBean = DdlPackBean.getDdlPackBean(organizeCode, dataAuth.getIsValidVal()); + } if (!StringUtils.isEmpty(dataAuth.getDataObject())) { DdlPreparedPack.getStringLikerPack(dataAuth.getDataObject(), "dataObject", packBean); } From 6b9b2e8dd2f6c5a3f4266a60d34a5973cc97192c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 13 May 2020 13:22:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?BUG#8438=E3=80=9020011--=20=E5=85=AD?= =?UTF-8?q?=E5=90=88=E4=B8=80=E6=94=B9=E6=95=B0=E6=8C=89=E9=92=AE=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E9=94=99=E8=AF=AF=EF=BC=8C=E6=89=93=E5=BC=80=E6=94=B9?= =?UTF-8?q?=E6=95=B0=E6=8C=89=E9=92=AE=E6=97=B6=EF=BC=8C=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=90=8E=E6=95=B0=E9=87=8F=E4=BC=9A=E7=B4=AF?= =?UTF-8?q?=E5=8A=A0=E5=9C=A8=E4=B8=8B=E6=96=B9=E6=98=8E=E7=BB=86=E4=B8=AD?= =?UTF-8?q?=E5=B9=B6=E4=B8=94=E8=AE=A9=E7=94=A8=E6=88=B7=E5=86=8D=E6=AC=A1?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=95=B0=E9=87=8F--0515=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index edc5ba7..aa23984 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1093,7 +1093,7 @@ public class WmsEnumUtil { return valueOf(val); } - public static Integer descriptionOfValue(String desc) { + public static int descriptionOfValue(String desc) { return descOf(desc); } @@ -1262,7 +1262,7 @@ public class WmsEnumUtil { return tmp; } - public static Integer descriptionOfValue(String desc) { + public static int descriptionOfValue(String desc) { return descOf(desc); } public static String valueOfDescription(int val) { From a4551a746a0bdb9b91276d506203d59b5a1e0c1c Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 13 May 2020 14:42:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=20=E4=BF=AE=E6=94=B9Dd?= =?UTF-8?q?lPackBean=E6=9F=A5=E8=AF=A2=20->=20=E5=B7=A5=E5=8E=82=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=8F=AF=E4=BB=A5=E6=98=AF=E8=8B=B1=E6=96=87=E6=88=96?= =?UTF-8?q?=E4=B8=AD=E6=96=87?= 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 | 4 ++-- 1 file changed, 2 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 0abeacf..8cc0971 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 @@ -63,7 +63,7 @@ public class DdlPackBean { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); - DdlPreparedPack.getNumEqualPack(organizeCode,"organizeCode",result); + DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result); return result; } @@ -79,7 +79,7 @@ public class DdlPackBean { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); DdlPreparedPack.getNumEqualPack(isValid,"isValid",result); - DdlPreparedPack.getNumEqualPack(organizeCode,"organizeCode",result); + DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result); return result; }