From 1c4833bb2e8c1bccd96038c339d114393f82e97c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 11 五月 2024 16:50:36 +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 |   37 ++++++++++++++++++++++++-------------
 1 files changed, 24 insertions(+), 13 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 0ddcce1..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;
 
@@ -22,28 +25,36 @@
 @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){
-        QueryWrapper<GlassInfo> queryWrapper = new QueryWrapper<GlassInfo>();
-        queryWrapper.eq("id",glassId);
-        return glassInfoMapper.selectList(queryWrapper);
+        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 glassInfoMapper.selectList(null);
+        return baseMapper.selectList(null);
     };
 
-    //鏍规嵁宸ョ▼ 鑾峰彇灏忕墖鏁版嵁
+    /**
+     * 鏍规嵁宸ョ▼ 鑾峰彇灏忕墖鏁版嵁
+     * @param flowCardId
+     * @return
+     */
     @Override
-    public List<GlassInfo> selectFlowcardId(String flowcardId){
-        QueryWrapper<GlassInfo> queryWrapper = new QueryWrapper<GlassInfo>();
-        queryWrapper.eq("flowcardId",flowcardId);
-        return glassInfoMapper.selectList(queryWrapper);
+    public List<GlassInfo> selectFlowCardId(String 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