From 6977fb42d5067f6c938ef3de559a6ad19b542a0b Mon Sep 17 00:00:00 2001 From: 严智鑫 <test> Date: 星期五, 14 六月 2024 11:29:09 +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 | 23 ++--------------------- 1 files changed, 2 insertions(+), 21 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 3b66b46..2b0a3a7 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,5 +1,6 @@ package com.mes.temperingglass.mapper; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mes.temperingglass.entity.TemperingGlassInfo; import org.apache.ibatis.annotations.Mapper; @@ -8,27 +9,7 @@ import java.util.List; @Mapper +@DS("salve_hangzhoumes") public interface TemperingMapper extends BaseMapper<TemperingGlassInfo> { - - - //鏌ヨ璇ョ幓鐠冪殑灏哄鍜屽潗鏍� -//@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(); - } -- Gitblit v1.8.0