From 41032cf2f65976e67e5d17f213e54c23b4a3759f Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 14 Apr 2021 17:11:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AB=8B=E9=A1=B9=20?= =?UTF-8?q?=E5=86=85=E9=83=A8=E5=A4=87=E6=B3=A8=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/ProjectApprovalFormDTO.java | 8 +++++--- .../java/com/epmet/controller/ProjectTraceController.java | 1 + .../com/epmet/service/impl/ProjectTraceServiceImpl.java | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java index 4553ab6654..d86d4873c1 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java @@ -15,18 +15,20 @@ import java.util.List; @Data public class ProjectApprovalFormDTO implements Serializable { private static final long serialVersionUID = 4859779755214502427L; + public interface ApprovalCategory{} - @NotBlank(message = "项目标题不能为空") + @NotBlank(message = "项目标题不能为空",groups = {ApprovalCategory.class}) private String title; - @NotBlank(message = "项目背景不能为空") + @NotBlank(message = "项目背景不能为空",groups = {ApprovalCategory.class}) @Length(max=1000,message = "项目背景不能超过1000位") private String backGround; - @NotBlank(message = "项目方案不能为空") + @NotBlank(message = "项目方案不能为空",groups = {ApprovalCategory.class}) @Length(max=1000,message = "项目方案不能超过1000位") private String publicReply; + @NotBlank(message = "内部备注不能为空",groups = {ApprovalCategory.class}) @Length(max=1000,message = "内部备注不能超过1000位") private String internalRemark; diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java index 82fe6a5984..199d762a85 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java @@ -352,6 +352,7 @@ public class ProjectTraceController { **/ @PostMapping("projectapproval") public Result projectApproval(@LoginUser TokenDto tokenDTO, @RequestBody ProjectApprovalFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO,ProjectApprovalFormDTO.ApprovalCategory.class); formDTO.setCustomerId(tokenDTO.getCustomerId()); formDTO.setApp(tokenDTO.getApp()); formDTO.setClient(tokenDTO.getClient()); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java index fedafc7ac0..c42c1e6933 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java @@ -289,7 +289,7 @@ public class ProjectTraceServiceImpl implements ProjectTraceS List staffList = formDTO.getStaffList(); //1.文字内容安全校验 List list = new ArrayList<>(); - list.add(formDTO.getTitle());list.add(formDTO.getBackGround());list.add(formDTO.getPublicReply()); + list.add(formDTO.getTitle());list.add(formDTO.getBackGround());list.add(formDTO.getPublicReply());list.add(formDTO.getInternalRemark()); safetyCheck(list); //2.数据准备，查询需要用到的数据