diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementCarouselBannerBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementCarouselBannerBo.java index 86796eec..04672f6f 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementCarouselBannerBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementCarouselBannerBo.java @@ -25,31 +25,27 @@ public class EnforcementCarouselBannerBo extends BaseEntity { /** * 主键ID */ - @NotBlank(message = "主键ID不能为空", groups = { EditGroup.class }) private String id; /** * 轮播标题,如“普法宣传图” */ - @NotBlank(message = "轮播标题,如“普法宣传图”不能为空", groups = { AddGroup.class, EditGroup.class }) private String title; /** * 发布平台 0-全部 1-企业端 2-执法端 3-监督端 */ - @NotNull(message = "发布平台 0-全部 1-企业端 2-执法端 3-监督端不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long targetPlatform; /** * 橱窗/轮播位,如“橱窗1” */ - @NotNull(message = "橱窗/轮播位,如“橱窗1”不能为空", groups = { AddGroup.class, EditGroup.class }) private Long carouselPosition; /** * 显示天数,0表示永久显示 */ - @NotNull(message = "显示天数,0表示永久显示不能为空", groups = { AddGroup.class, EditGroup.class }) private Long displayDays; /** @@ -65,7 +61,6 @@ public class EnforcementCarouselBannerBo extends BaseEntity { /** * 轮播图地址 */ - @NotBlank(message = "轮播图地址不能为空", groups = { AddGroup.class, EditGroup.class }) private String imageUrl; /** @@ -81,7 +76,6 @@ public class EnforcementCarouselBannerBo extends BaseEntity { /** * 是否删除 0=否 1=是 */ - @NotNull(message = "是否删除 0=否 1=是不能为空", groups = { AddGroup.class, EditGroup.class }) private Long isDelete; /** diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementLawNoticeBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementLawNoticeBo.java index 753cdcb1..eb225c0d 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementLawNoticeBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementLawNoticeBo.java @@ -25,7 +25,6 @@ public class EnforcementLawNoticeBo extends BaseEntity { /** * 主键ID */ - @NotBlank(message = "主键ID不能为空", groups = { EditGroup.class }) private String id; /** @@ -36,49 +35,45 @@ public class EnforcementLawNoticeBo extends BaseEntity { /** * 执法日期 */ - @NotBlank(message = "执法日期不能为空", groups = { AddGroup.class, EditGroup.class }) + private String enforceDate; /** * 执法时段 1=上午 2=下午 3=其他 */ - @NotNull(message = "执法时段 1=上午 2=下午 3=其他不能为空", groups = { AddGroup.class, EditGroup.class }) private Long enforcePeriod; /** * 执法单位ID */ - @NotBlank(message = "执法单位ID不能为空", groups = { AddGroup.class, EditGroup.class }) private String deptId; /** * 执法单位名称 */ - @NotBlank(message = "执法单位名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String deptName; /** * 执法人员姓名(多人员逗号分隔) */ - @NotBlank(message = "执法人员姓名(多人员逗号分隔)不能为空", groups = { AddGroup.class, EditGroup.class }) private String enforceUserNames; /** * 执法人员证件编号(多人员逗号分隔) */ - @NotBlank(message = "执法人员证件编号(多人员逗号分隔)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String enforceUserCodes; /** * 被检查企业ID */ - @NotBlank(message = "被检查企业ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private String companyId; /** * 被检查企业名称 */ - @NotBlank(message = "被检查企业名称不能为空", groups = { AddGroup.class, EditGroup.class }) private String companyName; /** @@ -89,25 +84,21 @@ public class EnforcementLawNoticeBo extends BaseEntity { /** * 企业联系人 */ - @NotBlank(message = "企业联系人不能为空", groups = { AddGroup.class, EditGroup.class }) private String contactPerson; /** * 企业联系电话 */ - @NotBlank(message = "企业联系电话不能为空", groups = { AddGroup.class, EditGroup.class }) private String contactPhone; /** * 执法事项 */ - @NotBlank(message = "执法事项不能为空", groups = { AddGroup.class, EditGroup.class }) private String enforceContent; /** * 执法要求 */ - @NotBlank(message = "执法要求不能为空", groups = { AddGroup.class, EditGroup.class }) private String enforceRequirement; /** @@ -118,13 +109,11 @@ public class EnforcementLawNoticeBo extends BaseEntity { /** * 预告状态 1=草稿 2=已发布 3=已取消 4=已执行 */ - @NotNull(message = "预告状态 1=草稿 2=已发布 3=已取消 4=已执行不能为空", groups = { AddGroup.class, EditGroup.class }) private Long status; /** * 是否删除 0=否 1=是 */ - @NotNull(message = "是否删除 0=否 1=是不能为空", groups = { AddGroup.class, EditGroup.class }) private Long isDelete; /**