From e208aa1ef8e861dba168e8d83ab3066fc9f1e02d Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 16 四月 2024 13:30:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/mapper/TemperingMapper.java | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/mapper/TemperingMapper.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/mapper/TemperingMapper.java
index 6461969..3b66b46 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/mapper/TemperingMapper.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/mapper/TemperingMapper.java
@@ -1,33 +1,34 @@
package com.mes.temperingglass.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.temperingglass.entity.GlassInfo;
import com.mes.temperingglass.entity.TemperingGlassInfo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
import java.util.List;
-
-import org.apache.ibatis.annotations.*;
@Mapper
public interface TemperingMapper extends BaseMapper<TemperingGlassInfo> {
-//鏌ヨ璇ョ幓鐠冪殑灏哄鍜屽潗鏍�
-@Select("select *from glass_info where id=#{glassid};")
-GlassInfo SelectGlass(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<TemperingGlassInfo> 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<TemperingGlassInfo> 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 <TemperingGlassInfo> SelectOutGlass();
+ @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<TemperingGlassInfo> 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<TemperingGlassInfo> 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<TemperingGlassInfo> SelectOutGlass();
}
--
Gitblit v1.8.0