Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
work2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
谢春璐
work2
Commits
0d4c5114
Commit
0d4c5114
authored
Oct 10, 2018
by
谢春璐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
d4ad2bb3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
10 deletions
+14
-10
src/main/java/com/zanchina/check/domain/Staff.java
+1
-1
src/main/java/com/zanchina/check/service/impl/FileServiceImpl.java
+4
-1
src/main/resources/static/index.html
+9
-8
No files found.
src/main/java/com/zanchina/check/domain/Staff.java
View file @
0d4c5114
...
...
@@ -23,7 +23,7 @@ public class Staff {
/**
* 部门
*/
private
String
department
;
private
String
department
=
""
;
/**
* 出勤列表
...
...
src/main/java/com/zanchina/check/service/impl/FileServiceImpl.java
View file @
0d4c5114
...
...
@@ -274,8 +274,11 @@ public class FileServiceImpl implements FileService {
List
<
Staff
>
value
=
staffEntry
.
getValue
();
List
<
WorkCheck
>
workChecks
=
new
ArrayList
<>();
List
<
Staff
>
staffList1
=
value
.
stream
().
filter
(
staff1
->
StringUtils
.
isNotBlank
(
staff1
.
getDepartment
()))
.
collect
(
Collectors
.
toList
());
staff
.
setDepartment
(
staffList1
.
size
()
>
0
?
staffList1
.
get
(
0
).
getDepartment
()
:
""
);
value
.
forEach
(
s
->
{
staff
.
setDepartment
(
s
.
getDepartment
());
workChecks
.
addAll
(
s
.
getWorkCheckList
());
}
);
...
...
src/main/resources/static/index.html
View file @
0d4c5114
...
...
@@ -13,10 +13,7 @@
<div
class=
"row align-items-center"
>
<table
class=
"table table-bordered"
>
<tbody>
<!--<tr>
<th scope="row">打卡机考勤记录:</th>
<td><input type="file" name="file"/></td>
</tr>-->
<tr>
<th
scope=
"row"
>
企业微信上下班打卡记录:
</th>
<td><input
type=
"file"
name=
"file"
/></td>
...
...
@@ -25,10 +22,14 @@
<th
scope=
"row"
>
企业微信外出打卡记录:
</th>
<td><input
type=
"file"
name=
"file"
/></td>
</tr>
<!--<tr>-->
<!--<th scope="row">钉钉打卡记录:</th>-->
<!--<td><input type="file" name="file"/></td>-->
<!--</tr>-->
<tr>
<th
scope=
"row"
>
打卡机考勤记录:
</th>
<td><input
type=
"file"
name=
"file"
/></td>
</tr>
<tr>
<th
scope=
"row"
>
钉钉打卡记录:
</th>
<td><input
type=
"file"
name=
"file"
/></td>
</tr>
</tbody>
</table>
...
...
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