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
420375c8
Commit
420375c8
authored
Sep 13, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改考勤汇总查询
parent
9962a0fe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStaffStatServiceImpl.java
...tendance/service/impl/AttendanceStaffStatServiceImpl.java
+2
-2
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/service/impl/DeptServiceImpl.java
...mortals/xhx/module/dept/service/impl/DeptServiceImpl.java
+2
-2
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStaffStatServiceImpl.java
View file @
420375c8
...
...
@@ -34,9 +34,9 @@ public class AttendanceStaffStatServiceImpl extends AbstractCRUDServiceImpl<Atte
if
(
params
==
null
){
throw
new
AppException
(
"查询条件对象不能为空"
);
}
if
(
params
.
getStaffId
()==
null
){
/*
if(params.getStaffId()==null){
throw new AppException("人员信息id不能为空");
}
}
*/
if
(
StringUtils
.
isEmpty
(
params
.
getSummaryTimeStart
())||
StringUtils
.
isEmpty
(
params
.
getSummaryTimeEnd
())){
throw
new
AppException
(
"查询日期范围不能为空"
);
}
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/service/impl/DeptServiceImpl.java
View file @
420375c8
package
com.mortals.xhx.module.dept.service.impl
;
import
com.alibaba.fastjson.JSON
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.xhx.common.code.EnableEnum
;
import
com.mortals.xhx.common.code.EnabledEnum
;
...
...
@@ -308,6 +309,7 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
Rest
<
OrgDataInfo
>
orgRest
=
hikPersonService
.
getOrgList
(
orgListReq
);
if
(
orgRest
.
getCode
()
==
YesNoEnum
.
YES
.
getValue
())
{
List
<
OrgInfo
>
orgInfoList
=
orgRest
.
getData
().
getList
();
log
.
info
(
"orgInfoList:{}"
,
JSON
.
toJSONString
(
orgInfoList
));
for
(
OrgInfo
orgInfo
:
orgInfoList
)
{
//查询数据库信息
DeptEntity
deptEntity
=
this
.
selectOne
(
new
DeptQuery
().
deptCode
(
orgInfo
.
getOrgIndexCode
()));
...
...
@@ -344,8 +346,6 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
@Override
public
Rest
<
String
>
syncDeptByDevice
(
Context
context
)
{
//todo
return
Rest
.
ok
();
}
...
...
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