From ffb62aac389a6ac596fe8d0d44d4e242beeea0f2 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 10 Mar 2022 11:46:31 +0800
Subject: [PATCH] 考勤查询接口修改，电子围栏自定义新增、修改，查询一个点是否在电子围栏内接口新增
---
src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java b/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
index 780686d..034d836 100644
--- a/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
+++ b/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
@@ -34,10 +34,10 @@
private String name;
/**
- * 保安公司 tenant_id
+ * 部门id
*/
- @TableField("tenant_id")
- private String tenantId;
+ @TableField("dept_id")
+ private Long deptId;
/**
* 联系人
@@ -60,7 +60,7 @@
private Integer city;
/**
- * 区
+ * 区 (暂时用作派遣单位类型使用，学校，医院等)
*/
private Integer district;
@@ -77,5 +77,50 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
+ /**
+ * 行政区id
+ */
+ private Long jurisdiction;
+
+ /**
+ * 合同生效时间
+ */
+ @TableField("start_time")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date startTime;
+
+
+
+ /**
+ * 合同到期时间
+ */
+ @TableField("end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date endTime;
+
+ /**
+ * 保安服务类型
+ */
+ @TableField("serve_type")
+ private String serveType;
+
+ /**
+ * 负责人（保安公司人员）
+ */
+ @TableField("security_linkman")
+ private String securityLinkman;
+
+ /**
+ * 负责人电话
+ */
+ private String cell;
+
+ /**
+ * 派遣人数
+ */
+ private Integer num;
+
}
--
Gitblit v1.9.3