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
c4080605
Commit
c4080605
authored
Aug 21, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改本月统计
parent
c7e7bc63
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
7 deletions
+17
-7
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordHikController.java
.../module/attendance/web/AttendanceRecordHikController.java
+17
-7
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordHikController.java
View file @
c4080605
package
com.mortals.xhx.module.attendance.web
;
package
com.mortals.xhx.module.attendance.web
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.util.StrUtil
;
import
cn.hutool.core.util.StrUtil
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.exception.AppException
;
...
@@ -169,6 +170,15 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
...
@@ -169,6 +170,15 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
super
.
doListBefore
(
query
,
model
,
context
);
super
.
doListBefore
(
query
,
model
,
context
);
}
}
@Override
public
void
doExportBefore
(
Context
context
,
AttendanceRecordHikEntity
query
,
List
<
String
>
properties
)
throws
AppException
{
if
(
ObjectUtils
.
isEmpty
(
query
.
getAttendanceDateStart
()))
{
query
.
setAttendanceDateStart
(
DateUtil
.
beginOfMonth
(
new
Date
()).
toDateStr
());
query
.
setAttendanceDateEnd
(
DateUtil
.
today
());
}
}
@Override
@Override
public
void
doExportFileAfter
(
byte
[]
data
,
AttendanceRecordHikEntity
query
,
Context
context
)
throws
AppException
{
public
void
doExportFileAfter
(
byte
[]
data
,
AttendanceRecordHikEntity
query
,
Context
context
)
throws
AppException
{
InputStream
inputStream
=
new
ByteArrayInputStream
(
data
);
InputStream
inputStream
=
new
ByteArrayInputStream
(
data
);
...
@@ -179,26 +189,26 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
...
@@ -179,26 +189,26 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
attendanceExportRecordEntity
.
setFilePath
(
filePath
);
attendanceExportRecordEntity
.
setFilePath
(
filePath
);
if
(
query
.
getIdList
()
!=
null
)
{
if
(
query
.
getIdList
()
!=
null
)
{
List
<
Long
>
idList
=
query
.
getIdList
();
List
<
Long
>
idList
=
query
.
getIdList
();
attendanceExportRecordEntity
.
setRecordIdList
(
idList
.
stream
().
map
(
i
->
i
.
toString
()).
collect
(
Collectors
.
joining
(
","
)));
attendanceExportRecordEntity
.
setRecordIdList
(
idList
.
stream
().
map
(
i
->
i
.
toString
()).
collect
(
Collectors
.
joining
(
","
)));
}
}
if
(
query
.
getAttendanceDateStart
()
!=
null
)
{
if
(
query
.
getAttendanceDateStart
()
!=
null
)
{
String
attendanceDate
=
query
.
getAttendanceDateStart
()
+
"~"
+
query
.
getAttendanceDateEnd
();
String
attendanceDate
=
query
.
getAttendanceDateStart
()
+
"~"
+
query
.
getAttendanceDateEnd
();
attendanceExportRecordEntity
.
setAttendanceDate
(
attendanceDate
);
attendanceExportRecordEntity
.
setAttendanceDate
(
attendanceDate
);
}
}
if
(!
ObjectUtils
.
isEmpty
(
query
.
getAttendanceGroupId
()))
{
if
(!
ObjectUtils
.
isEmpty
(
query
.
getAttendanceGroupId
()))
{
AttendanceGroupEntity
attendanceGroupEntity
=
groupService
.
get
(
query
.
getAttendanceGroupId
());
AttendanceGroupEntity
attendanceGroupEntity
=
groupService
.
get
(
query
.
getAttendanceGroupId
());
attendanceExportRecordEntity
.
setGroupName
(
attendanceGroupEntity
==
null
?
""
:
attendanceGroupEntity
.
getGroupName
());
attendanceExportRecordEntity
.
setGroupName
(
attendanceGroupEntity
==
null
?
""
:
attendanceGroupEntity
.
getGroupName
());
}
}
if
(!
ObjectUtils
.
isEmpty
(
query
.
getDeptId
()))
{
if
(!
ObjectUtils
.
isEmpty
(
query
.
getDeptId
()))
{
DeptEntity
deptEntity
=
deptService
.
get
(
query
.
getDeptId
(),
context
);
DeptEntity
deptEntity
=
deptService
.
get
(
query
.
getDeptId
(),
context
);
attendanceExportRecordEntity
.
setDeptName
(
deptEntity
==
null
?
""
:
deptEntity
.
getDeptName
());
attendanceExportRecordEntity
.
setDeptName
(
deptEntity
==
null
?
""
:
deptEntity
.
getDeptName
());
}
}
if
(!
ObjectUtils
.
isEmpty
(
query
.
getShiftsId
()))
{
if
(!
ObjectUtils
.
isEmpty
(
query
.
getShiftsId
()))
{
AttendanceClassEntity
attendanceClassEntity
=
classService
.
get
(
query
.
getShiftsId
(),
context
);
AttendanceClassEntity
attendanceClassEntity
=
classService
.
get
(
query
.
getShiftsId
(),
context
);
attendanceExportRecordEntity
.
setClassName
(
attendanceClassEntity
==
null
?
""
:
attendanceClassEntity
.
getClassName
());
attendanceExportRecordEntity
.
setClassName
(
attendanceClassEntity
==
null
?
""
:
attendanceClassEntity
.
getClassName
());
}
}
attendanceExportRecordEntity
.
setCreateUserId
(
context
.
getUser
().
getId
());
attendanceExportRecordEntity
.
setCreateUserId
(
context
.
getUser
().
getId
());
...
...
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