From 7cb9ffd37b133a8245e9530f19ee8be2de2a7ca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 14 Nov 2019 21:23:18 +0800 Subject: [PATCH] =?UTF-8?q?Lac=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96=20OPC?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java | 37 ++++++++++++++-------- .../pojo/model/lac/LacCommandStackModel.java | 7 ++++ 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java index 6bb3a32..5aa2301 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -34,8 +34,8 @@ public class LacHqlPack { public static DdlPackBean packHqlLacLogTask(LacLogTask bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(),"commandStackRecordId",ddlPackBean); - DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(), "commandStackRecordId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTaskId(), "taskId", ddlPackBean); return ddlPackBean; } @@ -43,7 +43,7 @@ public class LacHqlPack { public static DdlPackBean packHqlLacCommandStackTemplate(LacCommandStackTemplate bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getStringEqualPack(bean.getTemplateCode(),"templateCode",ddlPackBean); + DdlPreparedPack.getStringEqualPack(bean.getTemplateCode(), "templateCode", ddlPackBean); return ddlPackBean; } @@ -51,7 +51,9 @@ public class LacHqlPack { public static DdlPackBean packHqlLacCommandStackStep(LacCommandStackStep bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTemplateId(), "templateId", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getStepName(), "stepName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getStepCode(), "stepCode", ddlPackBean); return ddlPackBean; } @@ -59,24 +61,28 @@ public class LacHqlPack { public static DdlPackBean packHqlLacCommandStackStepTask(LacCommandStackStepTask bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTemplateId(), "templateId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getStepId(), "stepId", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getTaskNameRdd(), "taskNameRdd", ddlPackBean); return ddlPackBean; } public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - - DdlPreparedPack.getStringLikerPack(bean.getTaskName(),"taskName",ddlPackBean); - DdlPreparedPack.getStringLikerPack(bean.getTaskCode(),"taskCode",ddlPackBean); + if (bean == null) { + return ddlPackBean; + } + DdlPreparedPack.getStringLikerPack(bean.getTaskName(), "taskName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getTaskCode(), "taskCode", ddlPackBean); return ddlPackBean; } public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean, List idList) { - DdlPackBean ddlPackBean = packHqlLacSuitTask(bean) ; + DdlPackBean ddlPackBean = packHqlLacSuitTask(bean); - DdlPreparedPack.getInPackList(idList,"id",ddlPackBean); + DdlPreparedPack.getInPackList(idList, "id", ddlPackBean); return ddlPackBean; } @@ -90,15 +96,18 @@ public class LacHqlPack { public static DdlPackBean packHqlLacSuitTaskParamAdapter(LacSuitTaskParamAdapter bean, List taskIdList) { DdlPackBean ddlPackBean = packHqlLacSuitTaskParamAdapter(bean); - DdlPreparedPack.getInPackList(taskIdList,"taskId",ddlPackBean); + DdlPreparedPack.getInPackList(taskIdList, "taskId", ddlPackBean); return ddlPackBean; } public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getNumEqualPack(bean.getParamType(),"paramType",ddlPackBean); - DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean); + if(bean == null){ + return ddlPackBean; + } + DdlPreparedPack.getNumEqualPack(bean.getParamType(), "paramType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTaskId(), "taskId", ddlPackBean); return ddlPackBean; } @@ -106,7 +115,7 @@ public class LacHqlPack { public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean, List taskIdList) { DdlPackBean ddlPackBean = packHqlLacSuitTaskParam(bean); - DdlPreparedPack.getInPackList(taskIdList,"taskId",ddlPackBean); + DdlPreparedPack.getInPackList(taskIdList, "taskId", ddlPackBean); return ddlPackBean; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java index c9fb540..0cdedf7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java @@ -63,4 +63,11 @@ public class LacCommandStackModel { return null; } + public Long getRecordId(){ + if(recordId == null &&this.commandStackRecord !=null){ + this.recordId = this.commandStackRecord.getId(); + } + return recordId; + } + }