From 04b2dab7ecdc9aefde84db18f3cf0029b1db7eb2 Mon Sep 17 00:00:00 2001
From: gaoaoy <1042166043@qq.com>
Date: 星期二, 05 三月 2024 17:59:16 +0800
Subject: [PATCH] 6 设备工具明细BUG修改
---
cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
index 0b055d1..1ed9636 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
@@ -1,6 +1,5 @@
package com.yuanchu.mom.service.impl;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
@@ -27,12 +26,13 @@
private DeviceMapper deviceMapper;
@Override
- public Map<String, Object> selectDeviceParameter(Page page, Device itemParameter) {
+ public Map<String, Object> selectDeviceParameter(com.baomidou.mybatisplus.extension.plugins.pagination.Page page, Device itemParameter) {
Map<String, Object> map = new HashMap<>();
map.put("head", PrintChina.printChina(Device.class));
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectDeviceParameter");
if (map1.get("look") == 1) itemParameter.setCreateUser(map1.get("userId"));
- map.put("body", deviceMapper.selectDeviceParameter(page, QueryWrappers.queryWrappers(itemParameter)));
+// deviceMapper.selectPage(page, QueryWrappers.queryWrappers(itemParameter));
+ map.put("body", deviceMapper.selectPage(page, QueryWrappers.queryWrappers(itemParameter)));
return map;
}
@@ -53,7 +53,7 @@
@Override
public List<Device> selectEquipmentOverview() {
- return deviceMapper.selectEquipmentOverview();
+ return deviceMapper.selectEquipmentOverview(new com.baomidou.mybatisplus.extension.plugins.pagination.Page(1, 10), QueryWrappers.queryWrappers(new Device()));
}
@Override
@@ -66,5 +66,9 @@
return deviceMapper.search(status, deviceName, specificationModel, largeCategory);
}
+ @Override
+ public List<Device> selectDevicePrincipal() {
+ return deviceMapper.selectDevicePrincipal();
+ }
}
--
Gitblit v1.9.3