From 451c189bc3b04546b42f79c45bea464e85cc7ed2 Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang>
Date: Wed, 1 Jun 2022 11:01:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=AE=B0=E5=BD=95=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E5=92=8C=E5=8F=91=E8=B5=B7=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86=E6=A0=A1=E9=AA=8C=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/ServiceProjectFeedbackFormDTO.java | 3 +++
 .../java/com/epmet/dto/form/ServiceProjectRecordFormDTO.java   | 2 ++
 .../java/com/epmet/controller/IcServiceProjectController.java  | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/ServiceProjectFeedbackFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/ServiceProjectFeedbackFormDTO.java
index 83ad440628..231ab79b95 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/ServiceProjectFeedbackFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/ServiceProjectFeedbackFormDTO.java
@@ -2,6 +2,7 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
+import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import java.util.List;
 
@@ -37,6 +38,8 @@ public class ServiceProjectFeedbackFormDTO {
     private String longitude;
     private String latitude;
     private String address;
+
+    @Valid
     private List<Attachment> attachmentList;
 
     @Data
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/ServiceProjectRecordFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/ServiceProjectRecordFormDTO.java
index 11b2c188ef..59d86bfac5 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/ServiceProjectRecordFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/ServiceProjectRecordFormDTO.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
@@ -56,6 +57,7 @@ public class ServiceProjectRecordFormDTO {
      */
     private String remark;
 
+    @Valid
     private ServiceProjectFeedbackFormDTO feedback;
 
     private Integer pageNo = 1;
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceProjectController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceProjectController.java
index 654594f7d8..abcf757f89 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceProjectController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceProjectController.java
@@ -206,7 +206,7 @@ public class IcServiceProjectController {
     @PostMapping("/service/initiate")
     public Result initiateService(@RequestBody ServiceProjectRecordFormDTO input) {
 
-        ValidatorUtils.validateEntity(input, ServiceProjectRecordFormDTO.Initiate.class);
+        ValidatorUtils.validateEntity(input, ServiceProjectRecordFormDTO.Initiate.class, ServiceProjectFeedbackFormDTO.InitiateGroup.class);
         icServiceRecordService.initiateService(input);
 
         return new Result();