|
@@ -12,6 +12,7 @@ import cn.com.ty.lift.business.maintenance.dao.mapper.MaintenancePlanMapper;
|
|
|
import cn.com.ty.lift.business.maintenance.dao.mapper.MaintenanceRecordMapper;
|
|
|
import cn.com.ty.lift.business.project.dao.entity.Project;
|
|
|
import cn.com.ty.lift.business.project.dao.entity.model.ProjectAppUser;
|
|
|
+import cn.com.ty.lift.business.project.dao.entity.model.request.CapitalCompanyRequest;
|
|
|
import cn.com.ty.lift.business.project.dao.entity.model.request.CompanyRequest;
|
|
|
import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectDetailRequest;
|
|
|
import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectUserListRequest;
|
|
@@ -31,9 +32,7 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
-import java.util.LinkedList;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Objects;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
import java.util.stream.Stream;
|
|
|
|
|
@@ -133,12 +132,29 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
|
|
|
IPage<MaintenanceAppResponse> page = maintenancePlanMapper.findPlanByWorkerId(request.getPage(), request);
|
|
|
|
|
|
if (CollUtil.isNotEmpty(page.getRecords())) {
|
|
|
- List<MaintenanceAppResponse> currentUserTaskList = page.getRecords().stream().filter(entry ->
|
|
|
- Objects.equals(request.getWorkerId(), entry.getWorkerId())).collect(Collectors.toCollection(LinkedList::new));
|
|
|
-
|
|
|
- List<MaintenanceAppResponse> taskList = page.getRecords().stream().filter(entry ->
|
|
|
- !Objects.equals(request.getWorkerId(), entry.getWorkerId())).collect(Collectors.toList());
|
|
|
- currentUserTaskList.addAll(taskList);
|
|
|
+ Map<String, List<MaintenanceAppResponse>> currentTaskMap = page.getRecords().stream().filter(entry ->
|
|
|
+ Objects.equals(request.getWorkerId(), entry.getWorkerId())).collect(Collectors.groupingBy(MaintenanceAppResponse::getLiftId));
|
|
|
+ List<MaintenanceAppResponse> taskList = new ArrayList<>();
|
|
|
+ for (Map.Entry<String, List<MaintenanceAppResponse>> entry : currentTaskMap.entrySet()) {
|
|
|
+ List<MaintenanceAppResponse> value = entry.getValue();
|
|
|
+ MaintenanceAppResponse task = value.get(0);
|
|
|
+ taskList.add(task);
|
|
|
+ }
|
|
|
+ LinkedList<MaintenanceAppResponse> currentUserTaskList = taskList.stream()
|
|
|
+ .sorted(Comparator.comparing(MaintenanceAppResponse::getPlanDate)).collect(Collectors.toCollection(LinkedList::new));
|
|
|
+
|
|
|
+ Map<String, List<MaintenanceAppResponse>> taskMap = page.getRecords().stream().filter(entry ->
|
|
|
+ !Objects.equals(request.getWorkerId(), entry.getWorkerId())).collect(Collectors.groupingBy(MaintenanceAppResponse::getLiftId));
|
|
|
+
|
|
|
+ taskList.clear();
|
|
|
+ for (Map.Entry<String, List<MaintenanceAppResponse>> entry : taskMap.entrySet()) {
|
|
|
+ List<MaintenanceAppResponse> value = entry.getValue();
|
|
|
+ MaintenanceAppResponse task = value.get(0);
|
|
|
+ taskList.add(task);
|
|
|
+ }
|
|
|
+ LinkedList<MaintenanceAppResponse> userTaskList = taskList.stream()
|
|
|
+ .sorted(Comparator.comparing(MaintenanceAppResponse::getPlanDate)).collect(Collectors.toCollection(LinkedList::new));
|
|
|
+ currentUserTaskList.addAll(userTaskList);
|
|
|
|
|
|
page.setRecords(currentUserTaskList);
|
|
|
}
|
|
@@ -153,7 +169,37 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
|
|
|
* @date 2020/4/24 5:03 下午
|
|
|
*/
|
|
|
public IPage<MaintenanceAppResponse> recordTask(MaintenanceAppRequest request) {
|
|
|
- return maintenanceRecordMapper.findRecordByWorkerId(request.getPage(), request);
|
|
|
+ IPage<MaintenanceAppResponse> page = maintenanceRecordMapper.findRecordByWorkerId(request.getPage(), request);
|
|
|
+
|
|
|
+ if (CollUtil.isNotEmpty(page.getRecords())) {
|
|
|
+ Map<String, List<MaintenanceAppResponse>> currentTaskMap = page.getRecords().stream().filter(entry ->
|
|
|
+ Objects.equals(request.getWorkerId(), entry.getWorkerId1())).collect(Collectors.groupingBy(MaintenanceAppResponse::getLiftId));
|
|
|
+ List<MaintenanceAppResponse> taskList = new ArrayList<>();
|
|
|
+ for (Map.Entry<String, List<MaintenanceAppResponse>> entry : currentTaskMap.entrySet()) {
|
|
|
+ List<MaintenanceAppResponse> value = entry.getValue();
|
|
|
+ MaintenanceAppResponse task = value.get(0);
|
|
|
+ taskList.add(task);
|
|
|
+ }
|
|
|
+ LinkedList<MaintenanceAppResponse> currentUserTaskList = taskList.stream()
|
|
|
+ .sorted(Comparator.comparing(MaintenanceAppResponse::getPlanDate)).collect(Collectors.toCollection(LinkedList::new));
|
|
|
+
|
|
|
+ Map<String, List<MaintenanceAppResponse>> taskMap = page.getRecords().stream().filter(entry ->
|
|
|
+ !Objects.equals(request.getWorkerId(), entry.getWorkerId1())).collect(Collectors.groupingBy(MaintenanceAppResponse::getLiftId));
|
|
|
+
|
|
|
+ taskList.clear();
|
|
|
+ for (Map.Entry<String, List<MaintenanceAppResponse>> entry : taskMap.entrySet()) {
|
|
|
+ List<MaintenanceAppResponse> value = entry.getValue();
|
|
|
+ MaintenanceAppResponse task = value.get(0);
|
|
|
+ taskList.add(task);
|
|
|
+ }
|
|
|
+ LinkedList<MaintenanceAppResponse> userTaskList = taskList.stream()
|
|
|
+ .sorted(Comparator.comparing(MaintenanceAppResponse::getPlanDate)).collect(Collectors.toCollection(LinkedList::new));
|
|
|
+ currentUserTaskList.addAll(userTaskList);
|
|
|
+
|
|
|
+ page.setRecords(currentUserTaskList);
|
|
|
+ }
|
|
|
+
|
|
|
+ return page;
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -172,7 +218,7 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
|
|
|
* @description 根据公司id查询公司下大修项目列表
|
|
|
* @date 2020/4/20 8:18 下午
|
|
|
*/
|
|
|
- public IPage<ProjectCompanyResponse> capitalProjectList(CompanyRequest request) {
|
|
|
+ public IPage<ProjectCompanyResponse> capitalProjectList(CapitalCompanyRequest request) {
|
|
|
return capitalRepairLiftRelevanceMapper.findCapitalListByCompanyId(request.getPage(), request);
|
|
|
}
|
|
|
|