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
1c65e75f
Commit
1c65e75f
authored
Sep 10, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改考勤汇总查询
parent
ae529035
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceLeaveRecordServiceImpl.java
...ndance/service/impl/AttendanceLeaveRecordServiceImpl.java
+3
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceLeaveRecordController.java
...odule/attendance/web/AttendanceLeaveRecordController.java
+5
-3
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceLeaveRecordServiceImpl.java
View file @
1c65e75f
...
@@ -3,6 +3,7 @@ package com.mortals.xhx.module.attendance.service.impl;
...
@@ -3,6 +3,7 @@ package com.mortals.xhx.module.attendance.service.impl;
import
cn.hutool.core.date.DateTime
;
import
cn.hutool.core.date.DateTime
;
import
cn.hutool.core.date.DateUnit
;
import
cn.hutool.core.date.DateUnit
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.date.DateUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.aliyun.dingtalkworkflow_1_0.models.ListProcessInstanceIdsResponse
;
import
com.aliyun.dingtalkworkflow_1_0.models.ListProcessInstanceIdsResponse
;
import
com.aliyun.dingtalkworkflow_1_0.models.ListProcessInstanceIdsResponseBody
;
import
com.aliyun.dingtalkworkflow_1_0.models.ListProcessInstanceIdsResponseBody
;
...
@@ -206,6 +207,8 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
...
@@ -206,6 +207,8 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
getLeaveRecordByUserList
(
query
,
userEntityList
,
waitSyncLeaveRecords
);
getLeaveRecordByUserList
(
query
,
userEntityList
,
waitSyncLeaveRecords
);
}
}
log
.
info
(
"待同步请假记录:{}"
,
JSON
.
toJSONString
(
waitSyncLeaveRecords
));
if
(!
ObjectUtils
.
isEmpty
(
waitSyncLeaveRecords
))
{
if
(!
ObjectUtils
.
isEmpty
(
waitSyncLeaveRecords
))
{
for
(
AttendanceLeaveRecordEntity
waitSyncLeaveRecord
:
waitSyncLeaveRecords
)
{
for
(
AttendanceLeaveRecordEntity
waitSyncLeaveRecord
:
waitSyncLeaveRecords
)
{
dingPersonService
.
handleByProcessInstanceId
(
waitSyncLeaveRecord
.
getRemark
());
dingPersonService
.
handleByProcessInstanceId
(
waitSyncLeaveRecord
.
getRemark
());
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceLeaveRecordController.java
View file @
1c65e75f
...
@@ -110,13 +110,15 @@ public class AttendanceLeaveRecordController extends BaseCRUDJsonBodyMappingCont
...
@@ -110,13 +110,15 @@ public class AttendanceLeaveRecordController extends BaseCRUDJsonBodyMappingCont
long
between
=
DateUtil
.
between
(
DateUtil
.
parseDate
(
query
.
getStartTimeStart
()),
DateUtil
.
parseDate
(
query
.
getEndTimeEnd
()),
DateUnit
.
DAY
,
true
);
long
between
=
DateUtil
.
between
(
DateUtil
.
parseDate
(
query
.
getStartTimeStart
()),
DateUtil
.
parseDate
(
query
.
getEndTimeEnd
()),
DateUnit
.
DAY
,
true
);
if
(
between
>
120
)
throw
new
AppException
(
"时间范围不能超过120天"
);
if
(
between
>
120
)
throw
new
AppException
(
"时间范围不能超过120天"
);
Context
context
=
this
.
getContext
();
Context
context
=
this
.
getContext
();
Thread
thread
=
new
Thread
(
new
Runnable
()
{
Runnable
runnable
=
new
Runnable
()
{
@Override
@Override
public
void
run
()
{
public
void
run
()
{
service
.
syncLeaveRecord
(
query
,
context
);
service
.
syncLeaveRecord
(
query
,
context
);
}
}
});
};
ThreadPool
.
getInstance
().
execute
(
thread
);
ThreadPool
.
getInstance
().
execute
(
runnable
);
recordSysLog
(
request
,
busiDesc
+
" 【成功】"
);
recordSysLog
(
request
,
busiDesc
+
" 【成功】"
);
jsonObject
.
put
(
KEY_RESULT_CODE
,
VALUE_RESULT_SUCCESS
);
jsonObject
.
put
(
KEY_RESULT_CODE
,
VALUE_RESULT_SUCCESS
);
...
...
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