From d547fb41c160d98ab245d554bb9c4a22362dab1d Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 14 六月 2024 15:03:13 +0800
Subject: [PATCH] 删除无用类，增加自动绑定架子
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
index 12a1604..594c9b7 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
@@ -4,11 +4,14 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.toolkit.JoinWrappers;
-import com.mes.engineering.entity.Engineering;
-import com.mes.engineering.mapper.EngineeringMapper;
+import com.mes.downstorage.entity.DownStorageCage;
+import com.mes.downstorage.entity.DownStorageCageDetails;
+
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.glassinfo.service.GlassInfoService;
+import com.mes.uppattenusage.entity.UpPattenUsage;
+import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -26,13 +29,13 @@
@Service
public class GlassInfoServiceImpl extends ServiceImpl<GlassInfoMapper, GlassInfo> implements GlassInfoService {
- private EngineeringMapper engineeringMapper;
+ private UpPattenUsageMapper upPattenUsageMapper;
private GlassInfoMapper glassInfoMapper;
@Autowired(required=false)
- public GlassInfoServiceImpl(GlassInfoMapper glassInfoMapper, EngineeringMapper engineeringMapper) {
+ public GlassInfoServiceImpl(GlassInfoMapper glassInfoMapper, UpPattenUsageMapper upPattenUsageMapper) {
this.glassInfoMapper = glassInfoMapper;
- this.engineeringMapper = engineeringMapper;
+ this.upPattenUsageMapper = upPattenUsageMapper;
}
@Override
@@ -45,13 +48,13 @@
@Override
public List<Map<String, Object>> getFlowCardId() {
-
- return glassInfoMapper.selectJoinMaps(JoinWrappers.lambda(GlassInfo.class)
- .select(GlassInfo::getFlowCardId) // 閫夋嫨闇�瑕佹煡璇㈢殑瀛楁
- .eq(GlassInfo::getEngineerId, Engineering::getEngineerId) // 璁剧疆鍏宠仈鏉′欢
- .eq(Engineering::getState, 0)
- .distinct()
-
+ return baseMapper.selectJoinMaps(JoinWrappers.lambda(GlassInfo.class)
+ .select(GlassInfo::getFlowCardId)
+ .leftJoin(UpPattenUsage.class, on -> on
+ .eq(UpPattenUsage::getEngineeringId, GlassInfo::getEngineerId)
+ .ne(UpPattenUsage::getState, 300)
+ )
+ .groupBy(GlassInfo::getFlowCardId)
);
}
@@ -60,6 +63,8 @@
+
+
@Override
public GlassInfo selectGlassId(String id) {
return baseMapper.selectOne(new QueryWrapper<GlassInfo>().lambda()
--
Gitblit v1.8.0