From aa8ecde02d63168e11cdd693c84cd4de5fe2e04e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 17 May 2021 20:26:25 +0800
Subject: [PATCH] 1.考勤打卡接口修改，根据坐标判断是否在多边形区域内 2.考勤打卡接口修改，根据打卡时间判断打卡的状态
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java
index ff55404..6715cfb 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java
@@ -32,11 +32,31 @@
@ApiModel(value = "AlarmVO对象", description = "AlarmVO对象")
public class AlarmVO extends Alarm {
private static final long serialVersionUID = 1L;
- private String addvnm;
- private String serialNumber;
- private String stype;
- private String channelNumber;
- private String beginTime;
- private String endTime;
- private String name;
+ private String addvnm;
+ private String serialNumber;
+ private String stype;
+ private String channelNumber;
+ private String beginTime;
+ private String endTime;
+ private String name;
+ private String oneContacts;
+ private String twoContacts;
+ private String ThreeContacts;
+ private String onePhone;
+ private String twoPhone;
+ private String ThreePhone;
+ private String oneId;
+ private String twoId;
+ private String threeId;
+ private String deptId;
+ private String timeDesc;
+
+ private String securityArr;
+ private String securityId;
+ private String baname;
+ private String baid;
+ private String baphone;
+
+ private String deptName;
+
}
--
Gitblit v1.9.3