diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java index 22c04a7..8fd5bbc 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java @@ -126,10 +126,6 @@ public class LacSuitTask extends BaseBean { private LacSuitCase lacSuitCase; @Transient - @ApiParam(value ="任务实例id") - private Long taskInstanceId; - - @Transient @ApiParam(value ="适配原始参数") private Object orginParam; 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..3cac9ba 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 @@ -59,7 +59,10 @@ public class LacHqlPack { public static DdlPackBean packHqlLacCommandStackStepTask(LacCommandStackStepTask bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getNumEqualPack(bean.getTaskInstanceId(),"taskInstanceId",ddlPackBean); DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getStepId(),"stepId",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean); return ddlPackBean; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index ff5adbd..f9e9067 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -46,6 +46,13 @@ public class SysMenu extends BaseBean { @ApiParam(value ="功能代码") private String menuCode; + /** + * 产品类型暂时不能填写, 产品以上线调整影响范围太大. + */ + @Column(name="SOFT_TYPE") + @ApiParam(value ="产品类型", example = "0") + private Integer softTyp; + @Column(name="MENU_TYPE") @ApiParam(value ="功能类型" , example ="-1" ,access = "枚举:1.模块,2.菜单,3.按钮") private Integer menuType;