保养任务列表接口修改

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/mapper/MaintenancePlanMapper.java

@@ -4,6 +4,7 @@ import cn.com.ty.lift.business.maintenance.dao.entity.MaintenancePlan;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceAppRequest;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenancePlanRequest;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MtPlanRequest;
+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.entity.model.response.MtPlanResponse;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -28,7 +29,7 @@ public interface MaintenancePlanMapper extends BaseMapper<MaintenancePlan> {
      * @description 根据用户id和维保状态查询保养任务列表
      * @date 2020/4/24 5:03 下午
      */
-    IPage<MaintenancePlanResponse> findPlanByWorkerId(IPage<MaintenancePlanResponse> page, @Param("request") MaintenanceAppRequest request);
+    IPage<MaintenanceAppResponse> findPlanByWorkerId(IPage<MaintenancePlanResponse> page, @Param("request") MaintenanceAppRequest request);
 
     IPage<MtPlanResponse> pagePlanByCondition(IPage<MtPlanResponse> page, @Param("cond") MtPlanRequest request);
 

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/mapper/MaintenanceRecordMapper.java

@@ -6,6 +6,7 @@ import cn.com.ty.lift.business.maintenance.dao.entity.MaintenanceRecord;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceAppRequest;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceRecordRequest;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MtRecordRequest;
+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.entity.model.response.MaintenanceRecordResponse;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MtRecordResponse;
@@ -34,7 +35,7 @@ public interface MaintenanceRecordMapper extends BaseMapper<MaintenanceRecord> {
      * @description 根据用户id和维保状态查询保养任务列表
      * @date 2020/4/24 5:03 下午
      */
-    IPage<MaintenancePlanResponse> findRecordByWorkerId(IPage<MaintenancePlanResponse> page, @Param("request") MaintenanceAppRequest request);
+    IPage<MaintenanceAppResponse> findRecordByWorkerId(IPage<MaintenancePlanResponse> page, @Param("request") MaintenanceAppRequest request);
 
     /**
      * @param request 公司id和电梯id

lift-business-service/src/main/java/cn/com/ty/lift/business/project/controller/ProjectAppController.java

@@ -14,7 +14,7 @@ import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceA
 import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceAppRequest;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceRecordDetailRequest;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceRecordRequest;
-import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenancePlanResponse;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenanceAppResponse;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenanceRecordResponse;
 import cn.com.ty.lift.business.maintenance.service.MaintenanceRecordService;
 import cn.com.ty.lift.business.project.dao.entity.model.ProjectAppUser;
@@ -181,7 +181,7 @@ public class ProjectAppController {
      */
     @PostMapping("maintenance/planTask")
     public RestResponse planTask(@Valid @RequestBody MaintenanceAppRequest request) {
-        IPage<MaintenancePlanResponse> response = projectAppService.planTask(request);
+        IPage<MaintenanceAppResponse> response = projectAppService.planTask(request);
         if (CollUtil.isEmpty(response.getRecords())) {
             return RestResponse.success();
         }
@@ -196,7 +196,7 @@ public class ProjectAppController {
      */
     @PostMapping("maintenance/recordTask")
     public RestResponse recordTask(@Valid @RequestBody MaintenanceAppRequest request) {
-        IPage<MaintenancePlanResponse> response = projectAppService.recordTask(request);
+        IPage<MaintenanceAppResponse> response = projectAppService.recordTask(request);
         if (CollUtil.isEmpty(response.getRecords())) {
             return RestResponse.success();
         }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectAppService.java

@@ -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);
     }
 

lift-business-service/src/main/resources/mapper/maintenance/MaintenancePlanMapper.xml

@@ -120,6 +120,7 @@
 		       mp.worker_id        AS workerId,
 			   mp.plan_date        AS planDate,
 			   mp.type             AS maintenanceType,
+		       mp.status           AS status
 		FROM maintenance_plan mp
 				 LEFT JOIN project p ON mp.project_id = p.id
 		         LEFT JOIN project_user pu ON p.id = pu.project_id