项目立项 内部备注必填

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;
 

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());

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java

@@ -289,7 +289,7 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 		List<TickStaffFormDTO> staffList = formDTO.getStaffList();
 		//1.文字内容安全校验
 		List<String> 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.数据准备，查询需要用到的数据