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
f747f93b
Commit
f747f93b
authored
Mar 19, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
9ece74d0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
1 deletion
+12
-1
TakeLeaveEventCmdServiceImpl.java
...cation/store/store/impl/TakeLeaveEventCmdServiceImpl.java
+12
-1
No files found.
src/main/java/com/gogirl/application/store/store/impl/TakeLeaveEventCmdServiceImpl.java
View file @
f747f93b
...
@@ -26,6 +26,7 @@ import com.gogirl.shared.store.command.ApprovalTakeLeaveCommand;
...
@@ -26,6 +26,7 @@ import com.gogirl.shared.store.command.ApprovalTakeLeaveCommand;
import
com.gogirl.shared.store.query.qry.PageApplyQuery
;
import
com.gogirl.shared.store.query.qry.PageApplyQuery
;
import
com.google.common.collect.Lists
;
import
com.google.common.collect.Lists
;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
...
@@ -38,6 +39,7 @@ import java.util.stream.Collectors;
...
@@ -38,6 +39,7 @@ import java.util.stream.Collectors;
@Service
@Service
@AllArgsConstructor
@AllArgsConstructor
@Transactional
@Transactional
@Slf4j
public
class
TakeLeaveEventCmdServiceImpl
implements
TakeLeaveEventCmdService
{
public
class
TakeLeaveEventCmdServiceImpl
implements
TakeLeaveEventCmdService
{
/**
/**
...
@@ -80,6 +82,15 @@ public class TakeLeaveEventCmdServiceImpl implements TakeLeaveEventCmdService {
...
@@ -80,6 +82,15 @@ public class TakeLeaveEventCmdServiceImpl implements TakeLeaveEventCmdService {
.
collect
(
Collectors
.
toList
());
.
collect
(
Collectors
.
toList
());
//检查总调休时间
//检查总调休时间
if
(
takeLeaveEvent
.
getTimeLength
()
.
compareTo
(
overTimeRecordLogList
.
stream
().
map
(
OverTimeRecordLog:
:
getLengthTime
).
reduce
(
BigDecimal
.
ZERO
,
BigDecimal:
:
add
))
!=
0
)
{
log
.
info
(
"申请时间:{}"
,
takeLeaveEvent
.
getTimeLength
());
log
.
info
(
"选择的时间{},"
,
overTimeRecordLogList
.
stream
().
map
(
OverTimeRecordLog:
:
getLengthTime
).
reduce
(
BigDecimal
.
ZERO
,
BigDecimal:
:
add
));
throw
new
RRException
(
500
,
"调休时间有误"
);
}
//检查总调休时间
if
(!
takeLeaveEvent
.
getTimeLength
().
toString
()
if
(!
takeLeaveEvent
.
getTimeLength
().
toString
()
.
equals
(
overTimeRecordLogList
.
stream
().
map
(
OverTimeRecordLog:
:
getLengthTime
).
reduce
(
BigDecimal
.
ZERO
,
BigDecimal:
:
add
).
toString
()))
{
.
equals
(
overTimeRecordLogList
.
stream
().
map
(
OverTimeRecordLog:
:
getLengthTime
).
reduce
(
BigDecimal
.
ZERO
,
BigDecimal:
:
add
).
toString
()))
{
throw
new
RRException
(
500
,
"调休时间有误"
);
throw
new
RRException
(
500
,
"调休时间有误"
);
...
@@ -171,7 +182,7 @@ public class TakeLeaveEventCmdServiceImpl implements TakeLeaveEventCmdService {
...
@@ -171,7 +182,7 @@ public class TakeLeaveEventCmdServiceImpl implements TakeLeaveEventCmdService {
takeLeaveEvent
.
setRejectReason
(
cmd
.
getRejectReason
());
takeLeaveEvent
.
setRejectReason
(
cmd
.
getRejectReason
());
takeLeaveEventRepository
.
updateById
(
takeLeaveEvent
);
takeLeaveEventRepository
.
updateById
(
takeLeaveEvent
);
StoreTechnician
storeTechnician
=
storeTechnicianRepository
.
selectById
(
takeLeaveEvent
.
getApplyTechnicianId
());
StoreTechnician
storeTechnician
=
storeTechnicianRepository
.
selectById
(
takeLeaveEvent
.
getApplyTechnicianId
());
takeLeaveEvent
.
setApplyStoreTechnician
(
storeTechnician
);
takeLeaveEvent
.
setApplyStoreTechnician
(
storeTechnician
);
Message
message
=
Message
.
builder
()
Message
message
=
Message
.
builder
()
...
...
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