|
@@ -7,6 +7,7 @@ import cn.com.ty.lift.business.library.dao.entity.Lift;
|
|
|
import cn.com.ty.lift.business.library.dao.entity.model.request.LiftExtensionRequest;
|
|
|
import cn.com.ty.lift.business.library.service.LiftService;
|
|
|
import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceAppRequest;
|
|
|
+import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenanceAppResponse;
|
|
|
import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenancePlanResponse;
|
|
|
import cn.com.ty.lift.business.maintenance.dao.mapper.MaintenancePlanMapper;
|
|
|
import cn.com.ty.lift.business.maintenance.dao.mapper.MaintenanceRecordMapper;
|
|
@@ -22,6 +23,7 @@ import cn.com.ty.lift.business.project.dao.mapper.ProjectMapper;
|
|
|
import cn.com.ty.lift.business.project.dao.mapper.ProjectUserMapper;
|
|
|
import cn.com.ty.lift.common.constants.CommonEnum;
|
|
|
import cn.com.xwy.boot.web.dto.RestResponse;
|
|
|
+import cn.hutool.core.collection.CollUtil;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -29,7 +31,9 @@ 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.stream.Collectors;
|
|
|
|
|
|
/**
|
|
@@ -121,8 +125,21 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
|
|
|
* @description 根据用户id和维保状态查询保养任务列表
|
|
|
* @date 2020/1/6 11:29 上午
|
|
|
*/
|
|
|
- public IPage<MaintenancePlanResponse> planTask(MaintenanceAppRequest request) {
|
|
|
- return maintenancePlanMapper.findPlanByWorkerId(request.getPage(), request);
|
|
|
+ public IPage<MaintenanceAppResponse> planTask(MaintenanceAppRequest request) {
|
|
|
+ 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);
|
|
|
+
|
|
|
+ page.setRecords(currentUserTaskList);
|
|
|
+ }
|
|
|
+
|
|
|
+ return page;
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -131,7 +148,7 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
|
|
|
* @description 根据用户id和z维保状态查询保养任务列表
|
|
|
* @date 2020/4/24 5:03 下午
|
|
|
*/
|
|
|
- public IPage<MaintenancePlanResponse> recordTask(MaintenanceAppRequest request) {
|
|
|
+ public IPage<MaintenanceAppResponse> recordTask(MaintenanceAppRequest request) {
|
|
|
return maintenanceRecordMapper.findRecordByWorkerId(request.getPage(), request);
|
|
|
}
|
|
|
|