diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/HotTopicFormDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/HotTopicFormDTO.java index 63d809452..629de70e9 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/HotTopicFormDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/HotTopicFormDTO.java @@ -4,6 +4,7 @@ import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; @@ -20,13 +21,13 @@ public class HotTopicFormDTO implements Serializable { * 页码,从1开始 */ @Min(value = 1, message = "页码必须大于0") - private int pageIndex; + private Integer pageIndex; /** * 页容量,默认10页 */ @Min(value = 1, message = "每页条数必须大于必须大于0") - private int pageSize = 10; + private Integer pageSize = 10; /** * 第一页查询发起时的时间 @@ -37,8 +38,8 @@ public class HotTopicFormDTO implements Serializable { /** * 数据时间类型(1:最近1个月,2:最近3个月,3:最近半年,4:最近一年),默认1 */ - @NotBlank(message = "数据时间类型不能为空") - private int someMonthsType = 1; + @NotNull(message = "数据时间类型不能为空") + private Integer someMonthsType = 1; /** * 部门ID列表 diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/NewHotTopicFormDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/NewHotTopicFormDTO.java index c285a0887..00987be69 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/NewHotTopicFormDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/NewHotTopicFormDTO.java @@ -4,6 +4,7 @@ import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; @@ -20,13 +21,13 @@ public class NewHotTopicFormDTO implements Serializable { * 页码,从1开始 */ @Min(value = 1, message = "页码必须大于0") - private int pageIndex; + private Integer pageIndex; /** * 页容量,默认10页 */ @Min(value = 1, message = "每页条数必须大于必须大于0") - private int pageSize = 10; + private Integer pageSize = 10; /** * 第一页查询发起时的时间 @@ -37,8 +38,8 @@ public class NewHotTopicFormDTO implements Serializable { /** * 数据时间类型(1:最近1个月,2:最近3个月,3:最近半年,4:最近一年),默认1 */ - @NotBlank(message = "数据时间类型不能为空") - private int someMonthsType = 1; + @NotNull(message = "数据时间类型不能为空") + private Integer someMonthsType = 1; /** * 部门ID列表