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
5fae4ad6
Commit
5fae4ad6
authored
Mar 11, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加线程发送钉钉申诉
parent
bee3d588
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
attendance-performance-manager/src/main/bin/shutdown.sh
attendance-performance-manager/src/main/bin/shutdown.sh
+1
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordController.java
...xhx/module/attendance/web/AttendanceRecordController.java
+4
-4
No files found.
attendance-performance-manager/src/main/bin/shutdown.sh
View file @
5fae4ad6
...
...
@@ -21,6 +21,6 @@ fi
echo
"stoping application
$PROJECT_NAME
......"
kill
-
15
${
pid
}
kill
-
9
${
pid
}
echo
"Send shutdown request to Server
$PROJECT_NAME
OK"
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordController.java
View file @
5fae4ad6
...
...
@@ -224,22 +224,22 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
//生成上班 结果 下班 结果 4个map
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"name"
,
String
.
format
(
preStr
.
append
(
"/"
)
+
"上班打卡时间"
,
i
+
1
));
map
.
put
(
"name"
,
String
.
format
(
preStr
+
"上班打卡时间"
,
i
+
1
));
map
.
put
(
"value"
,
detailEntity
.
getGoWorkDate
()==
null
?
"--"
:
preStr
.
toString
()+
DateUtil
.
formatDateTime
(
detailEntity
.
getGoWorkDate
()));
mapList
.
add
(
map
);
map
=
new
HashMap
<>();
map
.
put
(
"name"
,
String
.
format
(
preStr
.
append
(
"/"
)
+
"上班打卡结果"
,
i
+
1
));
map
.
put
(
"name"
,
String
.
format
(
preStr
+
"上班打卡结果"
,
i
+
1
));
map
.
put
(
"value"
,
detailEntity
.
getGoWorkResult
()==
null
?
"--"
:
preStr
.
toString
()+
GoWorkResultEnum
.
getByValue
(
detailEntity
.
getGoWorkResult
()).
getDesc
());
mapList
.
add
(
map
);
map
=
new
HashMap
<>();
map
.
put
(
"name"
,
String
.
format
(
preStr
.
append
(
"/"
)
+
"下班打卡时间"
,
i
+
1
));
map
.
put
(
"name"
,
String
.
format
(
preStr
+
"下班打卡时间"
,
i
+
1
));
map
.
put
(
"value"
,
detailEntity
.
getOffWorkDate
()==
null
?
"--"
:
preStr
.
toString
()+
DateUtil
.
formatDateTime
(
detailEntity
.
getOffWorkDate
()));
mapList
.
add
(
map
);
map
=
new
HashMap
<>();
map
.
put
(
"name"
,
String
.
format
(
preStr
.
append
(
"/"
)
+
"下班打卡结果"
,
i
+
1
));
map
.
put
(
"name"
,
String
.
format
(
preStr
+
"下班打卡结果"
,
i
+
1
));
map
.
put
(
"value"
,
detailEntity
.
getOffWorkResult
()==
null
?
"--"
:
preStr
.
toString
()+
OffWorkResultEnum
.
getByValue
(
detailEntity
.
getOffWorkResult
()).
getDesc
());
mapList
.
add
(
map
);
}
else
{
...
...
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