Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gogirl-miniapp-backend
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
huluobin
gogirl-miniapp-backend
Commits
764e04d4
Commit
764e04d4
authored
Jul 15, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
10757cfc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
StoreTechnician.java
...n/java/com/gogirl/domain/store/store/StoreTechnician.java
+4
-0
Schedule.java
...ain/java/com/gogirl/infrastructure/schedule/Schedule.java
+3
-3
CareerController.java
.../com/gogirl/interfaces/store/career/CareerController.java
+0
-1
No files found.
src/main/java/com/gogirl/domain/store/store/StoreTechnician.java
View file @
764e04d4
...
...
@@ -55,6 +55,10 @@ public class StoreTechnician implements Serializable {
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
createTime
;
@ApiModelProperty
(
"入职日期"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
entryTime
;
@ApiModelProperty
(
"手机号"
)
private
String
mobile
;
...
...
src/main/java/com/gogirl/infrastructure/schedule/Schedule.java
View file @
764e04d4
...
...
@@ -461,10 +461,10 @@ public class Schedule {
career
.
setTechnicianId
(
storeTechnician
.
getId
());
}
career
.
setJoinDate
(
storeTechnician
.
get
Create
Time
());
career
.
setJoinDate
(
storeTechnician
.
get
Entry
Time
());
if
(
storeTechnician
.
get
Create
Time
()
!=
null
)
{
long
pastMills
=
System
.
currentTimeMillis
()
-
storeTechnician
.
get
Create
Time
().
getTime
();
if
(
storeTechnician
.
get
Entry
Time
()
!=
null
)
{
long
pastMills
=
System
.
currentTimeMillis
()
-
storeTechnician
.
get
Entry
Time
().
getTime
();
int
day
=
(
int
)
(
pastMills
/
1000
/
60
/
60
/
24
);
career
.
setOnJobTime
(
day
);
}
...
...
src/main/java/com/gogirl/interfaces/store/career/CareerController.java
View file @
764e04d4
...
...
@@ -157,7 +157,6 @@ public class CareerController {
public
JsonResult
<
StoreData
>
storeData
(
@RequestHeader
String
token
,
@RequestParam
String
month
)
{
StoreData
storeData
=
storeDataService
.
storeData
(
month
);
return
JsonResult
.
success
(
storeData
);
}
...
...
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