From 56d278881dbbbf6d47299ef2a765d7f857bc0cb0 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Fri, 20 Sep 2019 13:49:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=A1=A8=E5=8D=95=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=BF=85=E5=A1=AB=E9=A1=B9=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java | 6 ++++++ .../epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java | 4 ++++ .../esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java | 6 ++++++ .../modules/events/controller/EpdcEventsController.java | 1 + .../esua/epdc/modules/issue/controller/IssueController.java | 1 + .../esua/epdc/modules/item/controller/ItemController.java | 1 + 6 files changed, 19 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java index 4c1d5c18b..6b4c58ec5 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java @@ -2,6 +2,8 @@ package com.elink.esua.epdc.dto.events.form; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -16,17 +18,21 @@ public class EpdcEventsReviewFormDTO implements Serializable { /** * 事件ID */ + @NotBlank(message = "事件ID不能为空") private String id; /** * 类别ID */ + @NotBlank(message = "类别不能为空") private String categoryId; /** * 事件状态 */ + @NotNull(message = "操作不能为空") private Integer eventState; /** * 处理意见 */ + @NotBlank(message = "处理意见不能为空") private String advice; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java index b06bdd410..f0d8c71ae 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java @@ -2,6 +2,8 @@ package com.elink.esua.epdc.dto.issue.form; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -20,9 +22,11 @@ public class IssueWaitHandleSubmitFormDTO implements Serializable { /** * 处理意见 */ + @NotBlank(message = "处理意见不能为空") private String advice; /** * 状态 1 添加处理意见，2 关闭，4 转项目 */ + @NotNull(message = "处理操作不能为空") private Integer state; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java index d73cf1a3f..1e6561fd0 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java @@ -4,6 +4,8 @@ import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; import com.elink.esua.epdc.dto.item.result.ItemCirculationDeptResultDTO; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; @@ -19,21 +21,25 @@ public class ItemHandleSubmitFormDTO implements Serializable { /** * 项目ID */ + @NotBlank(message = "项目ID不能为空") private String id; /** * 处理意见（内部） */ + @NotBlank(message = "处理意见（内部）不能为空") private String handleAdvice; /** * 处理意见（外部） */ + @NotBlank(message = "处理意见（外部）不能为空") private String outHandleAdvice; /** * 处理方式：0 处理，1 流转协助，5 关闭，10 结案 */ + @NotNull(message = "处理结果不能为空") private int handleCategory; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java index f894a5e30..eb1681cd1 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java @@ -114,6 +114,7 @@ public class EpdcEventsController { */ @PostMapping("review") public Result eventReview(@RequestBody EpdcEventsReviewFormDTO dto) { + ValidatorUtils.validateEntity(dto); return epdcEventsService.eventReview(dto); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java index 34c550825..447f9b535 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java @@ -128,6 +128,7 @@ public class IssueController { */ @PostMapping("issueWaitHandleSubmit") public Result issueWaitHandleSubmit(@RequestBody IssueWaitHandleSubmitFormDTO dto) { + ValidatorUtils.validateEntity(dto); return issueService.saveIssueHandleResult(dto); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index fe5f86c01..80ab40693 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java @@ -120,6 +120,7 @@ public class ItemController { */ @PostMapping("itemHandleSubmit") public Result itemHandleSubmit(@RequestBody ItemHandleSubmitFormDTO dto) { + ValidatorUtils.validateEntity(dto); return itemService.modifyHandleResult(dto); }