diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java index 21144c89ab..b1f01ed63b 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java @@ -1,7 +1,9 @@ package com.epmet.dto.screencoll.form; import lombok.Data; +import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.NotBlank; import java.io.Serializable; /** @@ -17,46 +19,57 @@ public class PartyBranchDataFormDTO implements Serializable { /** * 年Id :yyyy */ + @NotBlank(message = "yearId不能为空") + @Length(max = 4,message = "yyyy") private String yearId; /** * 月份Id :yyyyMM */ + @NotBlank(message = "monthId不能为空") + @Length(max = 6,message = "格式:yyyyMM") private String monthId; /** * 数据类别 party:支部建设;union:联合建设党员志愿服务:voluntaryservice */ + @NotBlank(message = "type不能为空") private String type; /** * 组织类别 agency:组织;部门:department;网格:grid */ + @NotBlank(message = "orgType不能为空") private String orgType; /** * 组织Id 可以为网格,机关id */ + @NotBlank(message = "orgId不能为空") private String orgId; /** * 上级组织Id */ + @NotBlank(message = "parentId不能为空") private String parentId; /** * 组织名称 */ + @NotBlank(message = "orgName不能为空") private String orgName; /** * 会议分类名称 */ + @NotBlank(message = "meetCategoryName不能为空") private String meetCategoryName; /** * 会议分类id */ + @NotBlank(message = "meetCategoryId不能为空") private String meetCategoryId; /** diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataListFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataListFormDTO.java index 8c6a92e7b6..cfda49c5e0 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataListFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataListFormDTO.java @@ -1,7 +1,12 @@ package com.epmet.dto.screencoll.form; import lombok.Data; +import org.hibernate.validator.constraints.Length; +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; @@ -18,12 +23,17 @@ public class PartyBranchDataListFormDTO implements Serializable { /** * 当为true时后台将删除本月数据 */ + @NotNull(message = "isFirst不能为空") private Boolean isFirst; /** * yyyyMM */ + @NotBlank(message = "monthId不能为空") + @Length(max = 6,message = "格式:yyyyMM") private String monthId; + @Valid + @NotEmpty(message = "数据集合不能为空") private List dataList; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/ShiBeiScreenCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/ShiBeiScreenCollController.java index f142adbf6d..d99bece157 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/ShiBeiScreenCollController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/ShiBeiScreenCollController.java @@ -1,6 +1,7 @@ package com.epmet.controller.external; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.indexcollect.form.CustomerBizOrgFormDTO; import com.epmet.dto.screencoll.form.*; import com.epmet.service.evaluationindex.screen.ShiBeiScreenCollService; @@ -59,6 +60,7 @@ public class ShiBeiScreenCollController { **/ @PostMapping("meetdata") public Result meetData(@RequestHeader("CustomerId") String customerId, @RequestBody PartyBranchDataListFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); shiBeiScreenCollService.insertPartyBranchData(formDTO, customerId); return new Result(); }