Commit f747f93b by huluobin

update

parent 9ece74d0
...@@ -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()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment