From f100037d7ff1d575ee23effbb5ca77e01e12c564 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期二, 30 三月 2021 16:16:26 +0800
Subject: [PATCH] 更新设备维保接口
---
src/main/java/com/whyc/service/DeviceMaintainService.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/DeviceMaintainService.java b/src/main/java/com/whyc/service/DeviceMaintainService.java
index 0b3f84b..679dceb 100644
--- a/src/main/java/com/whyc/service/DeviceMaintainService.java
+++ b/src/main/java/com/whyc/service/DeviceMaintainService.java
@@ -14,6 +14,8 @@
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
@Service
public class DeviceMaintainService {
@@ -61,9 +63,21 @@
}
public Response getPageByCondition2(Integer pageNum, Integer pageSize, DeviceMaintainDTO maintainDTO) {
+ //1.鏌ヨ鍑烘墍鏈夌殑缁翠繚璁″垝鍙婂搴旂殑鏈�鍚庡疄闄呯淮淇濇椂闂�
+ //2.濡傛灉娌℃湁缁翠繚鏃堕棿鐨�,鎸夌収棣栦繚鏃堕棿+cycle寰楀埌棰勮鐨勬渶鍚庣淮淇濇椂闂�
+ // 鏈夊疄闄呯淮淇濇椂闂寸殑,鎸夌収鏈�鍚庡疄闄呯淮淇濇椂闂�+cycle寰楀埌棰勮鐨勬渶鍚庣淮淇濇椂闂�
PageHelper.startPage(pageNum,pageSize);
List<DeviceMaintain> deviceMaintainList = mapper.getPageByCondition2(maintainDTO);
- PageInfo<DeviceMaintain> deviceMaintainPageInfo = new PageInfo<>(deviceMaintainList);
+
+ List<DeviceMaintain> newDeviceMaintainList =null;
+ if(maintainDTO.getLastMaintainTime()!=null) {
+ newDeviceMaintainList = deviceMaintainList.stream().filter(deviceMaintain -> deviceMaintain.getLastMaintainTime().equals(maintainDTO.getLastMaintainTime()))
+ .collect(Collectors.toList());
+ }else{
+ newDeviceMaintainList = deviceMaintainList;
+ }
+ PageInfo<DeviceMaintain> deviceMaintainPageInfo = new PageInfo<>(newDeviceMaintainList);
+
return new Response().set(1,deviceMaintainPageInfo);
}
}
--
Gitblit v1.9.1