diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java index 37bbade..900be53 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java @@ -43,10 +43,19 @@ public class BfInterceptDetail extends BaseBean { @ApiParam(value ="拦截器类型") private Integer interceptType; + // 枚举 BlockFormEnumUtil.INTERCEPT_POSITION @Column(name="INTERCEPT_POSITION") @ApiParam(value ="拦截器位置") private Integer interceptPosition; + public Integer getInterceptPosition() { + if(this.interceptPosition == null){ + return null; + } else { + return this.interceptPosition.intValue(); + } + } + @Column(name="INTERCEPT_TARGET_ID") @ApiParam(value ="拦截目标id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java index 3b7d26b..e719404 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java @@ -34,7 +34,15 @@ public class SysFile extends BaseBean { @Column(name="NAME") @ApiParam(value ="文件名称") private String name; - + + @Column(name="FILE_CODE") + @ApiParam(value ="文件代码") + private String fileCode; + + @Column(name="FILE_SOFT_TYPE") + @ApiParam(value ="文件所属模块") + private Integer fileSoftType; + @Column(name="USER_ID") @ApiParam(value ="用户ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) @@ -51,11 +59,11 @@ public class SysFile extends BaseBean { @Column(name="FILE_PATH") @ApiParam(value ="文件路径") private String filePath; - + @Column(name="FILE_ORIGINAL_NAME") @ApiParam(value ="原始文件名称") private String fileOriginalName; - + @Column(name="FILE_TYPE_ID") @ApiParam(value ="文件类型ID") private Long fileTypeId; @@ -67,11 +75,11 @@ public class SysFile extends BaseBean { @Column(name="FILE_TYPE_NAME") @ApiParam(value ="文件类型名称") private String fileTypeName; - + @Column(name="FILE_SIZE") @ApiParam(value ="文件大小(KB)" , example ="0") private Integer fileSize; - + @Column(name="DOWNLOAD_NUM") @ApiParam(value ="下载次数" , example ="0") private Integer downloadNum; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 94489e1..c3faf6d 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.platform.sqlpack; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.platform.bean.*; import org.apache.commons.lang3.StringUtils; @@ -704,4 +706,22 @@ public class CoreHqlPack { return result.toString(); } + + + + /** + * 文件代码是否存在 + * @param sysFile 查询条件 + * @return DdlPackBean + */ + public static DdlPackBean packHqlSysFileCode(SysFile sysFile){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + // and + DdlPreparedPack.getStringEqualPack(sysFile.getFileCode(),"fileCode",ddlPackBean); + // not + DdlPreparedPack.getNumNOEqualPack(sysFile.getId(),"id",ddlPackBean); + + return ddlPackBean; + } } \ No newline at end of file