入住时间 退住时间

db/inti-elder.sql

@@ -45,6 +45,8 @@ CREATE TABLE `plat_elder`
     org_path                  varchar(64)  NULL COMMENT '组织路径',
     `remark`                  varchar(1024) DEFAULT NULL COMMENT '备注',
     avatar                    varchar(64)  NULL COMMENT '头像文件id',
+    checkInTime               datetime      DEFAULT NULL COMMENT '入住时间',
+    checkOutTime              datetime      DEFAULT NULL COMMENT '退住时间',
     `create_by`               varchar(64)   DEFAULT NULL COMMENT '创建者',
     `create_date`             datetime      DEFAULT NULL COMMENT '创建时间',
     `update_by`               varchar(64)   DEFAULT NULL COMMENT '更新者',
@@ -244,7 +246,7 @@ CREATE TABLE `plat_device`
     registration_date datetime     NOT NULL COMMENT '注册时间',
     last_online_data  datetime     NOT NULL COMMENT '最后上线时间',
     description       VARCHAR(1024) DEFAULT NULL COMMENT '说明',
-    status varchar(36) DEFAULT NULL COMMENT '状态 DeviceState',
+    status            varchar(36)   DEFAULT NULL COMMENT '状态 DeviceState',
     org_id            varchar(64)  NULL COMMENT '组织id',
     city_org_id       varchar(64)  NULL COMMENT '城市组织id',
     district_org_id   varchar(64)  NULL COMMENT '区组织id',

server-service/src/main/java/com/makeit/entity/platform/elder/PlatElder.java

@@ -8,6 +8,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 长者基本信息
@@ -186,5 +188,11 @@ public class PlatElder extends BaseBusEntity {
     @ApiModelProperty(value = "组织路径")
     private String orgPath;
 
+    @ApiModelProperty(value = "入住时间")
+    private LocalDateTime checkInTime;
+
+    @ApiModelProperty(value = "退住时间")
+    private LocalDateTime checkOutTime;
+
 
 }

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java

@@ -57,6 +57,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
@@ -616,6 +617,8 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
         PlatElder db = getById(dto.getId());
         BeanUtils.copyProperties(dto, db);
 
+        db.setCheckInTime(LocalDateTime.now());
+
         updateById(db);
 
         StatusDTO statusDTO = new StatusDTO();
@@ -649,6 +652,8 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
         db.setBedId(null);
         db.setSpacePath(null);
 
+        db.setCheckOutTime(LocalDateTime.now());
+
         updateById(db);
 
         //TODO ywc 是否删除房间 及其校验没做