From ebab5a2e4a5041d5ac08032221f24076238a33bb Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期一, 29 三月 2021 11:26:18 +0800
Subject: [PATCH] 修改设备列表接口
---
src/main/java/com/whyc/service/DeviceMaintainService.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/service/DeviceMaintainService.java b/src/main/java/com/whyc/service/DeviceMaintainService.java
index 32c19ea..6092cf8 100644
--- a/src/main/java/com/whyc/service/DeviceMaintainService.java
+++ b/src/main/java/com/whyc/service/DeviceMaintainService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageHelper;
+import com.whyc.dto.DeviceMaintainDTO;
import com.whyc.dto.Response;
import com.whyc.mapper.DeviceMaintainMapper;
import com.whyc.pojo.DeviceMaintain;
@@ -20,7 +22,7 @@
public Response get(Integer deviceId) {
QueryWrapper<DeviceMaintain> wrapper = Wrappers.query();
- wrapper.eq("status",1).eq("device_id",deviceId);
+ wrapper.eq("status",1).eq("plan",1).eq("device_id",deviceId);
DeviceMaintain deviceMaintain = mapper.selectOne(wrapper);
return new Response().set(1,deviceMaintain);
}
@@ -50,8 +52,9 @@
return new Response().set(1,deviceMaintains);
}
- public Response getPage(Integer pageNum, Integer pageSize) {
- QueryWrapper<Object> wrapper = Wrappers.query();
- return null;
+ public Response getPageByCondition(Integer pageNum, Integer pageSize, DeviceMaintainDTO maintainDTO) {
+ PageHelper.startPage(pageNum,pageSize);
+ List<DeviceMaintain> deviceMaintainList = mapper.getPageByCondition(maintainDTO);
+ return new Response().set(1,deviceMaintainList);
}
}
--
Gitblit v1.9.1