From a8c1dd008f9a096cb01774f17a8bceda5aafed88 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 26 二月 2025 15:04:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
index 386c8aa..4ead605 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.temperingglass.entity.TemperingGlassInfo;
@@ -150,10 +151,18 @@
@Override
public List<GlassInfo> selectTemperingGlass(GlassInfo glassInfo) {
- QueryWrapper<GlassInfo> wrapper = new QueryWrapper<>();
- wrapper.eq("engineer_id", glassInfo.getEngineerId())
- .eq("tempering_layout_id", glassInfo.getTemperingLayoutId())
- .select("engineer_id,tempering_layout_id,width,height,tempering_feed_sequence,x_coordinate,y_coordinate,angle,glass_id");
- return glassInfoMapper.selectList(wrapper);
+ List<GlassInfo> glassInfos = null;
+ glassInfos = glassInfoMapper.selectJoinList(GlassInfo.class, new MPJQueryWrapper<GlassInfo>()
+ .select("IFNULL(b.status, 0) AS status,engineer_id,tempering_layout_id,width,height,tempering_feed_sequence,x_coordinate,y_coordinate,angle,t.glass_id,t.flow_card_id")
+ .leftJoin("(SELECT glass_id, MAX(status) AS status FROM damage GROUP BY glass_id) b\n" +
+ "ON t.glass_id = b.glass_id")
+ .eq("engineer_id", glassInfo.getEngineerId())
+ .eq("tempering_layout_id", glassInfo.getTemperingLayoutId()));
+ return glassInfos;
+// QueryWrapper<GlassInfo> wrapper = new QueryWrapper<>();
+// wrapper.eq("engineer_id", glassInfo.getEngineerId())
+// .eq("tempering_layout_id", glassInfo.getTemperingLayoutId())
+// .select("engineer_id,tempering_layout_id,width,height,tempering_feed_sequence,x_coordinate,y_coordinate,angle,glass_id");
+// return glassInfoMapper.selectList(wrapper);
}
}
--
Gitblit v1.8.0