From 6d3bead888c6ba6537290bf56b8a092d7a1df4d8 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期五, 31 五月 2024 16:58:13 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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 58bb4b0..cd2bc4d 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
@@ -1,7 +1,13 @@
package com.mes.glassinfo.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.downstorage.entity.DownStorageCage;
+import com.mes.downstorage.entity.DownStorageCageDetails;
+import com.mes.engineering.entity.Engineering;
+import com.mes.engineering.mapper.EngineeringMapper;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.glassinfo.service.GlassInfoService;
@@ -22,11 +28,13 @@
@Service
public class GlassInfoServiceImpl extends ServiceImpl<GlassInfoMapper, GlassInfo> implements GlassInfoService {
+ private EngineeringMapper engineeringMapper;
private GlassInfoMapper glassInfoMapper;
@Autowired(required=false)
- public GlassInfoServiceImpl(GlassInfoMapper glassInfoMapper) {
+ public GlassInfoServiceImpl(GlassInfoMapper glassInfoMapper, EngineeringMapper engineeringMapper) {
this.glassInfoMapper = glassInfoMapper;
+ this.engineeringMapper = engineeringMapper;
}
@Override
@@ -36,15 +44,26 @@
}
+
@Override
public List<Map<String, Object>> getFlowCardId() {
- return baseMapper.selectMaps(new QueryWrapper<GlassInfo>().lambda().select(GlassInfo::getFlowCardId).groupBy(GlassInfo::getFlowCardId));
+ return baseMapper.selectJoinMaps(JoinWrappers.lambda(GlassInfo.class)
+ .select(GlassInfo::getFlowCardId)
+ .leftJoin(Engineering.class, on -> on
+ .eq(Engineering::getEngineerId, GlassInfo::getEngineerId)
+ .eq(Engineering::getState, 0)
+ )
+ .groupBy(GlassInfo::getFlowCardId)
+ );
}
+
+
+
@Override
public GlassInfo selectGlassId(String id) {
return baseMapper.selectOne(new QueryWrapper<GlassInfo>().lambda()
--
Gitblit v1.8.0