Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
attendance-performance-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
attendance-performance-platform
Commits
b61cd627
Commit
b61cd627
authored
Dec 04, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改redis认证方式
parent
76b4c858
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
6 deletions
+4
-6
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java
...odule/attendance/service/work/FixWorkOtherAttendance.java
+0
-4
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordHikController.java
.../module/attendance/web/AttendanceRecordHikController.java
+2
-0
attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http
...-manager/src/test/java/com/mortals/httpclient/system.http
+2
-2
doc/考勤绩效管理系统.docx
doc/考勤绩效管理系统.docx
+0
-0
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java
View file @
b61cd627
...
@@ -337,11 +337,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
...
@@ -337,11 +337,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
for
(
AttendanceRecordDetailEntity
recordDetailEntity
:
detailEntityList
)
{
for
(
AttendanceRecordDetailEntity
recordDetailEntity
:
detailEntityList
)
{
Integer
goWorkResult
=
recordDetailEntity
.
getGoWorkResult
();
Integer
goWorkResult
=
recordDetailEntity
.
getGoWorkResult
();
Integer
offWorkResult
=
recordDetailEntity
.
getOffWorkResult
();
Integer
offWorkResult
=
recordDetailEntity
.
getOffWorkResult
();
//判断是否是离职员工 如果是 则不添加
//判断是否是离职员工 如果是 则不添加
//判断上班
//判断上班
AttendanceClassDetailEntity
attendanceClassDetailEntity
=
attendanceClassDetailService
.
get
(
recordDetailEntity
.
getShiftsId
());
AttendanceClassDetailEntity
attendanceClassDetailEntity
=
attendanceClassDetailService
.
get
(
recordDetailEntity
.
getShiftsId
());
if
(
ObjectUtils
.
isEmpty
(
attendanceClassDetailEntity
))
continue
;
if
(
ObjectUtils
.
isEmpty
(
attendanceClassDetailEntity
))
continue
;
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordHikController.java
View file @
b61cd627
...
@@ -2,6 +2,7 @@ package com.mortals.xhx.module.attendance.web;
...
@@ -2,6 +2,7 @@ package com.mortals.xhx.module.attendance.web;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.util.StrUtil
;
import
cn.hutool.core.util.StrUtil
;
import
com.mortals.framework.annotation.UnAuth
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.Context
;
import
com.mortals.framework.model.Context
;
...
@@ -130,6 +131,7 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
...
@@ -130,6 +131,7 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
}
}
@PostMapping
(
value
=
"/addAttendanceRecord"
)
@PostMapping
(
value
=
"/addAttendanceRecord"
)
@UnAuth
public
Rest
<
String
>
addAttendanceRecord
(
@RequestBody
AttendanceRecordHikEntity
hikEntity
)
{
public
Rest
<
String
>
addAttendanceRecord
(
@RequestBody
AttendanceRecordHikEntity
hikEntity
)
{
Rest
<
String
>
ret
=
new
Rest
();
Rest
<
String
>
ret
=
new
Rest
();
Map
<
String
,
Object
>
model
=
new
HashMap
();
Map
<
String
,
Object
>
model
=
new
HashMap
();
...
...
attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http
View file @
b61cd627
...
@@ -33,8 +33,8 @@ Authorization: {{authToken}}
...
@@ -33,8 +33,8 @@ Authorization: {{authToken}}
Content-Type: application/json
Content-Type: application/json
{
{
"attendanceDateStart":"2023-
09-28
",
"attendanceDateStart":"2023-
12-01
",
"attendanceDateEnd":"2023-1
0-08
"
"attendanceDateEnd":"2023-1
2-01
"
}
}
...
...
doc/考勤绩效管理系统.docx
View file @
b61cd627
No preview for this file type
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