From cbcdcabd8289998b22017820fd1dc45ac8ca9704 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 3 Sep 2019 09:05:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 28 +++++++++++++++------- 1 file changed, 19 insertions(+), 9 deletions(-) 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 d77941e..fa0f89f 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 @@ -513,12 +513,23 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); return packBean; } + public static DdlPackBean getMesEventByEventName(MesEvent mesEvent) { + DdlPackBean packBean = getAllBaseData(mesEvent.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesEvent.getEventName(), "eventName", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + return packBean; + } public static DdlPackBean getMesActionByActionCode(MesAction mesAction, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode); DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(), "actionCode", packBean); return packBean; } + public static DdlPackBean getMesActionByActionName(MesAction mesAction, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode); + DdlPreparedPack.getStringEqualPack(mesAction.getActionName(), "actionName", packBean); + return packBean; + } public static DdlPackBean getMesActionExcludeById(MesAction mesAction) { DdlPackBean packBean = getAllBaseData(mesAction.getOrganizeCode()); @@ -554,14 +565,18 @@ public class MesHqlPack { DdlPreparedPack.getStringRightLikerPack(mesMethod.getMethodCode(), "methodCode", packBean); DdlPreparedPack.getStringLikerPack(mesMethod.getMethodName(), "methodName", packBean); DdlPreparedPack.getStringRightLikerPack(mesMethod.getCallClass(), "callClass", packBean); - DdlPreparedPack.getStringEqualPack(mesMethod.getMethodType() + "", "methodType", packBean); return packBean; } public static DdlPackBean getMesMethodByMethodCode(MesMethod mesMethod) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesMethod, mesMethod.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(mesMethod.getMethodCode(), "methodCode", packBean); + DdlPreparedPack.getStringEqualPack(mesMethod.getMethodCode(), "methodCode", packBean); + return packBean; + } + public static DdlPackBean getMesMethodByMethodName(MesMethod mesMethod) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesMethod, mesMethod.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesMethod.getMethodName(), "methodName", packBean); return packBean; } @@ -810,13 +825,8 @@ public class MesHqlPack { */ public static DdlPackBean getMesKpData(MesKpData kpData, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(kpData, organizeCode); - if (StringUtils.isNotEmpty(kpData.getPartNo())) { - DdlPreparedPack.getStringLikerPack(kpData.getKeyDataCode(), "partNo", packBean); - } - if (StringUtils.isNotEmpty(kpData.getKeyDataCode())) { - DdlPreparedPack.getStringLikerPack(kpData.getKeyDataCode(), "keyDataCode", packBean); - } - + DdlPreparedPack.getStringLikerPack(kpData.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(kpData.getKeyDataCode(), "keyDataCode", packBean); return packBean; }