From c219f11b51903d5aeb4c7ca261df593597aa7fe2 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 16 四月 2024 17:59:54 +0800
Subject: [PATCH] 人员明细+报告编制的提交审核批准+能力范围的下拉数据字典

---
 cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 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 1ed9636..c833734 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,5 +1,7 @@
 package com.yuanchu.mom.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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;
@@ -26,12 +28,11 @@
     private DeviceMapper deviceMapper;
 
     @Override
-    public Map<String, Object> selectDeviceParameter(com.baomidou.mybatisplus.extension.plugins.pagination.Page page, Device itemParameter) {
+    public Map<String, Object> selectDeviceParameter(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"));
-//        deviceMapper.selectPage(page, QueryWrappers.queryWrappers(itemParameter));
         map.put("body", deviceMapper.selectPage(page, QueryWrappers.queryWrappers(itemParameter)));
         return map;
     }
@@ -53,7 +54,7 @@
 
     @Override
     public List<Device> selectEquipmentOverview() {
-        return deviceMapper.selectEquipmentOverview(new com.baomidou.mybatisplus.extension.plugins.pagination.Page(1, 10), QueryWrappers.queryWrappers(new Device()));
+        return deviceMapper.selectEquipmentOverview(new Page(1, 10), QueryWrappers.queryWrappers(new Device()));
     }
 
     @Override
@@ -70,5 +71,10 @@
     public List<Device> selectDevicePrincipal() {
         return deviceMapper.selectDevicePrincipal();
     }
+
+    @Override
+    public List<Device> selectDeviceByCategory(String category) {
+        return deviceMapper.selectList(Wrappers.<Device>lambdaQuery().eq(Device::getLargeCategory, category).eq(Device::getDeviceStatus, 0));
+    }
 }
 

--
Gitblit v1.9.3