Merge branch 'dev_memo' into develop

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;
 
     /**

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;
 
     /**

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/AddMemoDifficultyFromDTO.java

@@ -4,6 +4,7 @@ import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import com.epmet.dto.MemoAttachmentDTO;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
@@ -48,11 +49,13 @@ public class AddMemoDifficultyFromDTO implements Serializable {
     /**
      * 计划执行时间
      */
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
 	private Date scheduledTime;
 
     /**
      * 提醒时间
      */
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
     private Date remindTime;
 
     /**

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

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoAttrDao.xml

@@ -82,7 +82,7 @@
 
     <select id="memoTime" resultType="java.lang.String">
         SELECT DISTINCT
-            DATE_FORMAT(remind_time, '%Y-%m-%d %H:%i:%s') remindTime
+            DATE_FORMAT(remind_time, '%Y-%m-%d %H:%i') remindTime
         FROM
             memo_attr
         WHERE