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
52c968fb
Commit
52c968fb
authored
Jul 15, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加照片海康下载
parent
aa8e31a6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/AppealApiController.java
...ava/com/mortals/xhx/busiz/h5/web/AppealApiController.java
+2
-1
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/AppealApiController.java
View file @
52c968fb
...
...
@@ -114,7 +114,7 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
//未设置时间的情况,默认为当月
appealReq
.
setApperalStartDate
(
DateUtil
.
beginOfMonth
(
new
Date
()).
toDateStr
());
appealReq
.
setAppealEndDate
(
DateUtil
.
today
());
}
else
{
}
else
{
//格式化到指定日期的当月
appealReq
.
setApperalStartDate
(
DateUtil
.
beginOfMonth
(
DateUtil
.
parse
(
appealReq
.
getApperalStartDate
()).
toJdkDate
()).
toDateStr
());
appealReq
.
setAppealEndDate
(
DateUtil
.
endOfMonth
(
DateUtil
.
parse
(
appealReq
.
getApperalStartDate
()).
toJdkDate
()).
toDateStr
());
...
...
@@ -224,6 +224,7 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
entity
.
setStaffId
(
context
.
getUser
().
getCustomerId
());
entity
.
setCreateUserId
(
context
.
getUser
().
getId
());
entity
.
setCheckRecordId
(
req
.
getId
());
entity
.
setAppealTime
(
new
Date
());
PerformAttendAppealEntity
saveEntity
=
appealService
.
save
(
entity
,
context
);
rest
.
setData
(
saveEntity
);
...
...
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