From f79e68601719d4ad1c37f486c74fced55eeed269 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期五, 24 五月 2024 08:22:28 +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 |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 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 a874049..7e04d74 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
@@ -2,9 +2,12 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.query.MPJLambdaQueryWrapper;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.mes.glassinfo.entity.GlassInfo;
 import com.mes.glassinfo.mapper.GlassInfoMapper;
 import com.mes.glassinfo.service.GlassInfoService;
+import com.mes.taskcache.entity.TaskCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,21 +26,35 @@
 public class GlassInfoServiceImpl extends ServiceImpl<GlassInfoMapper, GlassInfo> implements GlassInfoService {
 
 
-    //鏍规嵁ID 鑾峰彇灏忕墖鏁版嵁
+    /**
+     * 鏍规嵁ID 鑾峰彇灏忕墖鏁版嵁
+     * @param glassId
+     * @return
+     */
     @Override
     public List<GlassInfo> selectId(String glassId){
-        return baseMapper.selectList(new QueryWrapper<GlassInfo>().eq("id",glassId));
+        return baseMapper.selectList(new MPJLambdaWrapper<GlassInfo>().selectAll(GlassInfo.class).eq(GlassInfo::getGlassId,glassId));
+//        return baseMapper.selectList(new QueryWrapper<GlassInfo>().eq("glass_id",glassId));
     };
 
-    //鑾峰彇鍏ㄩ儴灏忕墖鏁版嵁
+    /**
+     * 鑾峰彇鍏ㄩ儴灏忕墖鏁版嵁
+     * @return
+     */
     @Override
     public List<GlassInfo> selectAll(){
         return baseMapper.selectList(null);
     };
 
-    //鏍规嵁宸ョ▼ 鑾峰彇灏忕墖鏁版嵁
+    /**
+     * 鏍规嵁宸ョ▼ 鑾峰彇灏忕墖鏁版嵁
+     * @param flowCardId
+     * @return
+     */
     @Override
     public List<GlassInfo> selectFlowCardId(String flowCardId){
-        return baseMapper.selectList(new QueryWrapper<GlassInfo>().eq("flowCardId",flowCardId));
+        return baseMapper.selectList(new MPJLambdaWrapper<GlassInfo>().selectAll(GlassInfo.class).eq(GlassInfo::getFlowCardId,flowCardId));
+        //Sql鐗堟湰
+//        return baseMapper.selectList(new QueryWrapper<GlassInfo>().eq("flow_card_id",flowCardId));
     };
 }

--
Gitblit v1.8.0