Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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.*;
-import javax.persistence.Entity;
+import java.util.List;
-import javax.persistence.Lob;
-import javax.persistence.Table;
 
 /**
  * @Description :
@@ -126,5 +124,7 @@ public class LacLogTask extends BaseBean {
     @ApiParam(value ="执行说明")
     private String executionDescription;
 
-
+    @Transient
+    @ApiParam(value ="步骤列表")
+    private List<LacLogTaskDetail> detailList;
 }

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)

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.getCommandStackRecordId(),"commandStackRecordId",ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean);
 
         return ddlPackBean;
     }