From 4725595ed0d3684bde0efbe45889482b46bc6fb0 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期一, 22 四月 2024 16:38:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
index cae494e..f62e9ca 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
@@ -22,24 +22,33 @@
 @Service
 public class GlassInfoServiceImpl extends ServiceImpl<GlassInfoMapper, GlassInfo> implements GlassInfoService {
 
-    @Autowired
-    GlassInfoMapper glassInfoMapper;
 
-    //鏍规嵁ID 鑾峰彇灏忕墖鏁版嵁
+    /**
+     * 鏍规嵁ID 鑾峰彇灏忕墖鏁版嵁
+     * @param glassId
+     * @return
+     */
     @Override
     public List<GlassInfo> selectId(String glassId){
-        return glassInfoMapper.selectList(new QueryWrapper<GlassInfo>().eq("id",glassId));
+        return baseMapper.selectList(new QueryWrapper<GlassInfo>().eq("glass_id",glassId));
     };
 
-    //鑾峰彇鍏ㄩ儴灏忕墖鏁版嵁
+    /**
+     * 鑾峰彇鍏ㄩ儴灏忕墖鏁版嵁
+     * @return
+     */
     @Override
     public List<GlassInfo> selectAll(){
-        return glassInfoMapper.selectList(null);
+        return baseMapper.selectList(null);
     };
 
-    //鏍规嵁宸ョ▼ 鑾峰彇灏忕墖鏁版嵁
+    /**
+     * 鏍规嵁宸ョ▼ 鑾峰彇灏忕墖鏁版嵁
+     * @param flowCardId
+     * @return
+     */
     @Override
     public List<GlassInfo> selectFlowCardId(String flowCardId){
-        return glassInfoMapper.selectList(new QueryWrapper<GlassInfo>().eq("flowCardId",flowCardId));
+        return baseMapper.selectList(new QueryWrapper<GlassInfo>().eq("flow_card_id",flowCardId));
     };
 }

--
Gitblit v1.8.0