From 86adbb1544142dcfb48333dade822f81640607a6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 01 九月 2023 13:50:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyServiceImpl.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyServiceImpl.java
index 38a5bfb..e66d960 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyServiceImpl.java
@@ -24,15 +24,18 @@
public class TechnologyServiceImpl extends ServiceImpl<TechnologyMapper, Technology> implements TechnologyService {
@Resource
- private TechnologyMapper technologyMapper;
+ TechnologyMapper technologyMapper;
+
+ //鏍规嵁鍨嬪彿id鏌ヨ鐗堟湰
@Override
- public List<Map<String, Object>> selectTechnology(String technologyName) {
- LambdaQueryWrapper<Technology> wrapper = new LambdaQueryWrapper<>();
- if (!ObjectUtils.isEmpty(technologyName)){
- wrapper.like(Technology::getName, technologyName);
- }
- wrapper.select(Technology::getId, Technology::getName, Technology::getDeviceGroup, Technology::getFather);
- return technologyMapper.selectMaps(wrapper);
+ public List<Integer> selectVerByTec(Integer specificationsId) {
+ return technologyMapper.selectVerByTec(specificationsId);
+ }
+
+ //鍙充晶鏁版嵁灞曠ず-->宸ヨ壓璺嚎
+ @Override
+ public List<Map<String, Object>> selectAllTec(Integer specificationsId, Integer version,String message) {
+ return technologyMapper.selectAllTec(specificationsId,version,message);
}
}
--
Gitblit v1.9.3