From fd7b9aabefdcfa4e2f8504c77d5a4e6f4f955585 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sun, 22 Aug 2021 14:50:28 +0800
Subject: [PATCH] 1.ftp
---
src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java b/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java
index 2499d69..30b6dcb 100644
--- a/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java
+++ b/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java
@@ -16,16 +16,18 @@
*/
package org.springblade.modules.dispatcher.entity;
-import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
/**
* 实体类
@@ -58,11 +60,13 @@
@ApiModelProperty(value = "派遣人")
private String dispatcher;
/**
- * 派遣时间
+ * 派遣开始时间
*/
- @ApiModelProperty(value = "派遣时间")
+ @ApiModelProperty(value = "派遣开始时间")
@TableField("dispatcherTime")
- private LocalDateTime dispatchertime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date dispatchertime;
/**
* 派遣地址
*/
@@ -73,8 +77,42 @@
* 派遣地址
*/
@ApiModelProperty(value = "派遣单位")
- @TableField("dispatcherCompany")
- private String dispatchercompany;
+ @TableField("dispatcher_unit_id")
+ private String dispatcherUnitId;
+ /**
+ * 派遣保安ids
+ */
+ @TableField("user_ids")
+ private String userIds;
+
+
+ /**
+ * 派遣结束时间
+ */
+ @TableField("end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+
+
+ /**
+ * 保安公司(组织机构)id
+ */
+ @TableField("dept_id")
+ private Long deptId;
+
+
+ /**
+ * 辖区
+ */
+ private String jurisdiction;
+
+
+ /**
+ * 派遣人数
+ */
+ private Integer num;
+
}
--
Gitblit v1.9.3