Browse Source

提交表单增加必填项校验

dev
liuchuang 6 years ago
parent
commit
56d278881d
  1. 6
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java
  2. 4
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java
  3. 6
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java
  4. 1
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java
  5. 1
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java
  6. 1
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java

6
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 lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable; import java.io.Serializable;
/** /**
@ -16,17 +18,21 @@ public class EpdcEventsReviewFormDTO implements Serializable {
/** /**
* 事件ID * 事件ID
*/ */
@NotBlank(message = "事件ID不能为空")
private String id; private String id;
/** /**
* 类别ID * 类别ID
*/ */
@NotBlank(message = "类别不能为空")
private String categoryId; private String categoryId;
/** /**
* 事件状态 * 事件状态
*/ */
@NotNull(message = "操作不能为空")
private Integer eventState; private Integer eventState;
/** /**
* 处理意见 * 处理意见
*/ */
@NotBlank(message = "处理意见不能为空")
private String advice; private String advice;
} }

4
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 lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable; import java.io.Serializable;
/** /**
@ -20,9 +22,11 @@ public class IssueWaitHandleSubmitFormDTO implements Serializable {
/** /**
* 处理意见 * 处理意见
*/ */
@NotBlank(message = "处理意见不能为空")
private String advice; private String advice;
/** /**
* 状态 1 添加处理意见2 关闭4 转项目 * 状态 1 添加处理意见2 关闭4 转项目
*/ */
@NotNull(message = "处理操作不能为空")
private Integer state; private Integer state;
} }

6
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 com.elink.esua.epdc.dto.item.result.ItemCirculationDeptResultDTO;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
@ -19,21 +21,25 @@ public class ItemHandleSubmitFormDTO implements Serializable {
/** /**
* 项目ID * 项目ID
*/ */
@NotBlank(message = "项目ID不能为空")
private String id; private String id;
/** /**
* 处理意见内部 * 处理意见内部
*/ */
@NotBlank(message = "处理意见(内部)不能为空")
private String handleAdvice; private String handleAdvice;
/** /**
* 处理意见外部 * 处理意见外部
*/ */
@NotBlank(message = "处理意见(外部)不能为空")
private String outHandleAdvice; private String outHandleAdvice;
/** /**
* 处理方式0 处理1 流转协助5 关闭10 结案 * 处理方式0 处理1 流转协助5 关闭10 结案
*/ */
@NotNull(message = "处理结果不能为空")
private int handleCategory; private int handleCategory;
/** /**

1
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") @PostMapping("review")
public Result eventReview(@RequestBody EpdcEventsReviewFormDTO dto) { public Result eventReview(@RequestBody EpdcEventsReviewFormDTO dto) {
ValidatorUtils.validateEntity(dto);
return epdcEventsService.eventReview(dto); return epdcEventsService.eventReview(dto);
} }

1
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") @PostMapping("issueWaitHandleSubmit")
public Result issueWaitHandleSubmit(@RequestBody IssueWaitHandleSubmitFormDTO dto) { public Result issueWaitHandleSubmit(@RequestBody IssueWaitHandleSubmitFormDTO dto) {
ValidatorUtils.validateEntity(dto);
return issueService.saveIssueHandleResult(dto); return issueService.saveIssueHandleResult(dto);
} }

1
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") @PostMapping("itemHandleSubmit")
public Result itemHandleSubmit(@RequestBody ItemHandleSubmitFormDTO dto) { public Result itemHandleSubmit(@RequestBody ItemHandleSubmitFormDTO dto) {
ValidatorUtils.validateEntity(dto);
return itemService.modifyHandleResult(dto); return itemService.modifyHandleResult(dto);
} }

Loading…
Cancel
Save