From d853127b56455a29eefb3fd148e62f0e3db13402 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 16 Mar 2022 16:23:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/MemoConcernDTO.java         | 6 ++++++
 .../src/main/java/com/epmet/dto/MemoWorkDiaryDTO.java       | 5 +++++
 .../java/com/epmet/service/impl/MemoConcernServiceImpl.java | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoConcernDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoConcernDTO.java
index 230887b58a..7ccc04ee24 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoConcernDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoConcernDTO.java
@@ -1,8 +1,11 @@
 package com.epmet.dto;
 
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -22,6 +25,7 @@ public class MemoConcernDTO implements Serializable {
     /**
      * 唯一标识(同memo_attr表Id)
      */
+    @NotBlank(message = "ID不能为空", groups = { UpdateGroup.class })
 	private String id;
 
     /**
@@ -37,6 +41,7 @@ public class MemoConcernDTO implements Serializable {
     /**
      * 关怀对象
      */
+    @NotBlank(message = "关怀人员不能为空", groups = { AddGroup.class, UpdateGroup.class })
 	private String resiName;
 
     /**
@@ -52,6 +57,7 @@ public class MemoConcernDTO implements Serializable {
     /**
      * 关怀事项
      */
+    @NotBlank(message = "关怀事项不能为空", groups = { AddGroup.class, UpdateGroup.class })
 	private String content;
 
     /**
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoWorkDiaryDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoWorkDiaryDTO.java
index 2bde9822fa..517cce113d 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoWorkDiaryDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoWorkDiaryDTO.java
@@ -1,8 +1,11 @@
 package com.epmet.dto;
 
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -22,6 +25,7 @@ public class MemoWorkDiaryDTO implements Serializable {
     /**
      * 唯一标识(同memo_attr表Id)
      */
+    @NotBlank(message = "ID不能为空", groups = { UpdateGroup.class })
 	private String id;
 
     /**
@@ -37,6 +41,7 @@ public class MemoWorkDiaryDTO implements Serializable {
     /**
      * 内容
      */
+    @NotBlank(message = "内容不能为空", groups = { AddGroup.class, UpdateGroup.class })
 	private String content;
 
     /**
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoConcernServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoConcernServiceImpl.java
index 94c2de470a..bca27c6f81 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoConcernServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoConcernServiceImpl.java
@@ -88,7 +88,7 @@ public class MemoConcernServiceImpl extends BaseServiceImpl<MemoConcernDao, Memo
         //保存属性
         MemoAttrDTO attr = ConvertUtils.sourceToTarget(dto, MemoAttrDTO.class);
         attr.setId(entity.getId());
-        attr.setType(MemoConstant.WORK_DIARY);
+        attr.setType(MemoConstant.CONCERN);
         attr.setReadFlag(NumConstant.ZERO);
         attr.setReceiver(dto.getCreatedBy());
         memoAttrService.save(attr);