From dd39d15b6b47679778df6a7041e7be01ddc3debd Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 08 十二月 2022 16:21:15 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/service/equipment/impl/EquipmentBayonetServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/equipment/impl/EquipmentBayonetServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/equipment/impl/EquipmentBayonetServiceImpl.java
index 148f835..7256360 100644
--- a/ycl-platform/src/main/java/com/ycl/service/equipment/impl/EquipmentBayonetServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/equipment/impl/EquipmentBayonetServiceImpl.java
@@ -1,20 +1,15 @@
package com.ycl.service.equipment.impl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.entity.dict.DataDictionary;
import com.ycl.entity.equipment.EquipmentBayonet;
import com.ycl.mapper.equipment.EquipmentBayonetMapper;
import com.ycl.service.equipment.IEquipmentBayonetService;
import com.ycl.vo.equipment.EquipmentBayonetVO;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
-import java.util.stream.Collectors;
/**
* <p>
@@ -26,4 +21,17 @@
*/
@Service
public class EquipmentBayonetServiceImpl extends ServiceImpl<EquipmentBayonetMapper, EquipmentBayonet> implements IEquipmentBayonetService {
+
+ @Resource
+ EquipmentBayonetMapper equipmentBayonetMapper;
+
+ @Override
+ public Page<EquipmentBayonetVO> selectEquipmentPage(Page<EquipmentBayonet> equipmentBayonetPage, String bayonetName) {
+ return equipmentBayonetMapper.selectEquipmentPage(equipmentBayonetPage, bayonetName);
+ }
+
+ @Override
+ public List<EquipmentBayonetVO> selectEquipmentList(String bayonetName) {
+ return equipmentBayonetMapper.selectEquipmentPage(bayonetName);
+ }
}
--
Gitblit v1.8.0