Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
entrance_api
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王琮
entrance_api
Commits
fe6abe90
Commit
fe6abe90
authored
Dec 07, 2022
by
罗可心
😕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
考勤数据,添加打开设备名称字段
parent
ba92da24
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
3 deletions
+23
-3
AttendanceSync.java
...ava/org/rcisoft/sys/attendance/entity/AttendanceSync.java
+19
-1
InvitedPersonServiceImpl.java
...soft/sys/visit/service/impl/InvitedPersonServiceImpl.java
+2
-2
AttendanceSyncMapper.xml
src/main/resources/mapper/AttendanceSyncMapper.xml
+2
-0
No files found.
src/main/java/org/rcisoft/sys/attendance/entity/AttendanceSync.java
View file @
fe6abe90
...
@@ -87,7 +87,25 @@ public class AttendanceSync extends CyIdEntity<AttendanceSync> {
...
@@ -87,7 +87,25 @@ public class AttendanceSync extends CyIdEntity<AttendanceSync> {
@Excel
(
name
=
"下班时间"
,
orderNum
=
"6"
,
width
=
20
)
@Excel
(
name
=
"下班时间"
,
orderNum
=
"6"
,
width
=
20
)
private
String
offHours
;
private
String
offHours
;
/**
/**
* @desc 上班打卡设备名称
* @column work_device_name
* @default
*/
private
String
workDeviceName
;
/**
* @desc 下班打卡设备名称
* @column off_device_name
* @default
*/
private
String
offDeviceName
;
/**
* @desc 考勤日期
* @desc 考勤日期
* @column date_of_attendance
* @column date_of_attendance
* @default
* @default
...
...
src/main/java/org/rcisoft/sys/visit/service/impl/InvitedPersonServiceImpl.java
View file @
fe6abe90
...
@@ -53,11 +53,11 @@ public class InvitedPersonServiceImpl extends ServiceImpl<InvitedPersonRepositor
...
@@ -53,11 +53,11 @@ public class InvitedPersonServiceImpl extends ServiceImpl<InvitedPersonRepositor
public
VisitInfoMation
getLastVisitInfo
(
HttpServletRequest
request
)
{
public
VisitInfoMation
getLastVisitInfo
(
HttpServletRequest
request
)
{
//获取当前时间
//获取当前时间
Date
date
=
new
Date
();
Date
date
=
new
Date
();
System
.
out
.
println
(
"当前系统时间"
+
date
);
//
System.out.println("当前系统时间" + date);
//获取当前用户手机号
//获取当前用户手机号
String
phone
=
CyUserUtil
.
getUserInfoStrProp
(
cyJwtUtil
.
getToken
(
request
),
CyUserUtil
.
USER_PHONE
);
String
phone
=
CyUserUtil
.
getUserInfoStrProp
(
cyJwtUtil
.
getToken
(
request
),
CyUserUtil
.
USER_PHONE
);
System
.
out
.
println
(
"用户手机号"
+
phone
);
//
System.out.println("用户手机号" + phone);
//如果电话为空 则返回空值
//如果电话为空 则返回空值
if
(
StringUtils
.
isEmpty
(
phone
)){
if
(
StringUtils
.
isEmpty
(
phone
)){
...
...
src/main/resources/mapper/AttendanceSyncMapper.xml
View file @
fe6abe90
...
@@ -10,6 +10,8 @@
...
@@ -10,6 +10,8 @@
<result
column=
"position_label"
jdbcType=
"VARCHAR"
property=
"positionLabel"
/>
<result
column=
"position_label"
jdbcType=
"VARCHAR"
property=
"positionLabel"
/>
<result
column=
"work_hours"
jdbcType=
"VARCHAR"
property=
"workHours"
/>
<result
column=
"work_hours"
jdbcType=
"VARCHAR"
property=
"workHours"
/>
<result
column=
"off_hours"
jdbcType=
"VARCHAR"
property=
"offHours"
/>
<result
column=
"off_hours"
jdbcType=
"VARCHAR"
property=
"offHours"
/>
<result
column=
"work_device_name"
jdbcType=
"VARCHAR"
property=
"workDeviceName"
/>
<result
column=
"off_device_name"
jdbcType=
"VARCHAR"
property=
"offDeviceName"
/>
<result
column=
"date_of_attendance"
jdbcType=
"VARCHAR"
property=
"dateOfAttendance"
/>
<result
column=
"date_of_attendance"
jdbcType=
"VARCHAR"
property=
"dateOfAttendance"
/>
<result
column=
"time_on_job"
jdbcType=
"VARCHAR"
property=
"timeOnJob"
/>
<result
column=
"time_on_job"
jdbcType=
"VARCHAR"
property=
"timeOnJob"
/>
<result
column=
"nlt_bz"
jdbcType=
"VARCHAR"
property=
"nltBz"
/>
<result
column=
"nlt_bz"
jdbcType=
"VARCHAR"
property=
"nltBz"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment