From 422877c3b73f1acd57fb90d902f097492c5aacea Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 10 May 2022 14:20:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=81=E5=87=BA=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=EF=BC=8C=E8=B0=83=E5=8A=A8=E5=85=A5=E5=8F=82=E8=B5=8B?=
 =?UTF-8?q?=E5=80=BC=E5=B0=91=E4=BA=86=E8=B0=83=E5=8A=A8=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/ChangeRelocationDTO.java    | 6 ++++++
 .../epmet/service/impl/IcUserTransferRecordServiceImpl.java | 1 +
 2 files changed, 7 insertions(+)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java
index c874655700..72914073bb 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -205,4 +206,9 @@ public class ChangeRelocationDTO implements Serializable {
      * 当前登录用户id
      */
     private String staffId;
+    /**
+     * 调动时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date transferTime;
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
index 879dbd7d1c..6aef5be083 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
@@ -301,6 +301,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void moveOutResi(IcResiUserTransferFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, IcResiUserTransferFormDTO.TransferAdd.class);
         //1.判断被调动人员是否有效
         IcResiUserDTO resiUserDTO = getIcResiUserDTO(formDTO.getCustomerId(), formDTO.getIcUserId());
         //2.查询人员调动前的组织、网格、小区、楼栋、单元、房屋信息