Skip to content

W
work_service
Commit 1aa0bcc1 authored by nie'hong's avatar nie'hong
Browse files
Options

完善工时统计

parent e79e14cb
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
View file @ 1aa0bcc1
......@@ -314,6 +314,9 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
List<WorkProject> projectsByIds = workProjectMapper.getProjectsByIds(null, 0);
if (!CollectionUtils.isEmpty(projectsByIds)) {
for (WorkTimeOrderDto workTimeOrder : workTimeOrders) {
if (StatusEnum.APPROVED.getCode().equals(workTimeOrder.getStatus())||StatusEnum.AUTOMATIC_AUDIT.getCode().equals(workTimeOrder.getStatus())) {
continue;
}
if (workTimeOrder.getType().equals(1) || workTimeOrder.getType().equals(2)) {
for (WorkProject projectsById : projectsByIds) {
if (projectsById.getId().equals(workTimeOrder.getProjectId())) {
......
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