From f4332f48695216a2503d8ab43d3a540b68cb5302 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 09 四月 2024 14:18:56 +0800
Subject: [PATCH] 代码更新

---
 TemperingGlassModule/src/main/java/com/mes/mapper/TemperingMapper.java |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/TemperingGlassModule/src/main/java/com/mes/mapper/TemperingMapper.java b/TemperingGlassModule/src/main/java/com/mes/mapper/TemperingMapper.java
index f8d99d6..5ec7ed8 100644
--- a/TemperingGlassModule/src/main/java/com/mes/mapper/TemperingMapper.java
+++ b/TemperingGlassModule/src/main/java/com/mes/mapper/TemperingMapper.java
@@ -1,18 +1,33 @@
 package com.mes.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.entity.OrderTest;
+import com.mes.entity.GlassInfo;
 import com.mes.entity.Tempering;
+
+import java.util.List;
 
 import org.apache.ibatis.annotations.*;
 
 @Mapper
-public interface OrderTestMapper extends BaseMapper<OrderTest> {
+public interface TemperingMapper extends BaseMapper<Tempering> {
 
 
 //鏌ヨ璇ョ幓鐠冪殑灏哄鍜屽潗鏍�
-@Select("select*from where id=#{glassId}")
-Tempering SelectTempering(String glassId);
+@Select("select *from glass_info where id=#{glassid};")
+GlassInfo SelectGlass(String glassid);
+//鏄惁鍙互鍙戦�佽繘鐐変俊鍙�
+@Select("select count(*) from glass_info where id=#{glassid};")
+int SelectTempering(String glassid);
+//鏌ヨ绛夊緟涓殑閽㈠寲鐗堝浘鐜荤拑淇℃伅
+@Select("select*from tempering_glass_info a left join (select flowcard_id,count(state)state from tempering_glass_info GROUP BY flowcard_id,state)b on a.flowcard_id=b.flowcard_id where b.state=2")
+List<Tempering> SelectWaitingGlass();
+//鏌ヨ杩涚倝涓殑閽㈠寲鐗堝浘鐜荤拑淇℃伅
+@Select("select*from tempering_glass_info a left join (select flowcard_id,min(state)state1 from tempering_glass_info GROUP BY flowcard_id having state1=1)b on a.flowcard_id=b.flowcard_id where b.state1=1")
+List<Tempering> SelectInGlass();
+//鏌ヨ閽㈠寲鍚庣殑閽㈠寲鐗堝浘淇℃伅
+@Select("select*from tempering_glass_info a left join (select flowcard_id,min(state)state1 from tempering_glass_info GROUP BY flowcard_id having state1=2)b on a.flowcard_id=b.flowcard_id where b.state1=2")
+List <Tempering> SelectOutGlass();
+
 
 
 }

--
Gitblit v1.8.0