From d410ba2d4d45b82286adafe6a9bf4dfb3ced6a9e Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 19 四月 2024 09:04:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
index b337c2d..2d5282b 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
@@ -1,10 +1,8 @@
package com.mes.edgstoragecage.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
import com.mes.edgstoragecage.service.EdgStorageCageService;
@@ -14,7 +12,6 @@
import org.springframework.stereotype.Service;
import java.util.Map;
import java.util.*;
-import java.util.stream.Collectors;
/**
* <p>
@@ -43,6 +40,11 @@
.leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
.isNull("escd.slot")
);
+// List<Map> map=baseMapper.selectJoinList(Map.class,JoinWrappers.lambda(EdgStorageCage.class)
+// .selectAll(EdgStorageCage.class)
+// .select(EdgStorageCageDetails::getGlassId,EdgStorageCageDetails::getFlowCardId,EdgStorageCageDetails::getWidth,EdgStorageCageDetails::getHeight)//鏌ヨuser_address tel 瀛楁
+// .leftJoin(EdgStorageCageDetails.class,EdgStorageCageDetails::getSlot,EdgStorageCage::getSlot)
+// .isNull(EdgStorageCageDetails::getSlot));
return map;
}
--
Gitblit v1.8.0