From 0ba20f0094a1a96a292c2e51e3771e9c2f4a6d61 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Mon, 4 Nov 2019 14:33:22 +0800
Subject: [PATCH] =?UTF-8?q?LAC=20=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=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

---
 .../main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java    | 10 +++++-----
 .../java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java   |  5 +++++
 .../main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java |  4 ++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java
index aa6ca4a..4ebc6e9 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java
@@ -10,10 +10,8 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
+import javax.persistence.*;
+import java.util.List;
 
 /**
  * @Description :
@@ -126,5 +124,7 @@ public class LacLogTask extends BaseBean {
     @ApiParam(value ="执行说明")
     private String executionDescription;
 
-
+    @Transient
+    @ApiParam(value ="步骤列表")
+    private List<LacLogTaskDetail> detailList;
 }
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java
index 01cc4d0..8c5a66c 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java
@@ -54,6 +54,11 @@ public class LacLogTaskDetail extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long stepId;
 
+    @Column(name="LOG_TASK_ID")
+    @ApiParam(value ="任务实例ID" , example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long logTaskId;
+
     @Column(name="TASK_ID")
     @ApiParam(value ="任务ID" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
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 6d04b02..9a42293 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(),"",ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(),"commandStackRecordId",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean);
 
         return ddlPackBean;
     }