From 967c35a4aea280512b71cca6547e126bcde5a024 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 14 六月 2024 15:04:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml
index 9d6527c..1f64557 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageDetailsMapper.xml
@@ -3,15 +3,42 @@
<mapper namespace="com.mes.bigstorage.mapper.BigStorageCageDetailsMapper">
<resultMap id="temperingLayoutDTO" type="com.mes.bigstorage.entity.dto.TemperingLayoutDTO">
+ <result column="engineer_id" property="engineerId"/>
<result column="tempering_layout_id" property="temperingLayoutId"/>
<result column="count" property="count"/>
</resultMap>
- <select id="listAllTemperingCount" resultMap="temperingLayoutDTO">
- select tempering_layout_id,
- count(tempering_layout_id) as count
- from big_storage_cage_details
- where state = 100
- group by tempering_layout_id
+ <!-- <select id="listAllTemperingCount" resultMap="temperingLayoutDTO">-->
+ <!-- select tempering_layout_id,-->
+ <!-- count(tempering_layout_id) as count-->
+ <!-- from big_storage_cage_details-->
+ <!-- where state = 100-->
+ <!-- group by tempering_layout_id-->
+ <!-- </select>-->
+ <select id="temperingIsAll" resultMap="temperingLayoutDTO">
+ SELECT T.ENGINEER_ID,
+ T.TEMPERING_LAYOUT_ID,
+ COUNT(T.TEMPERING_FEED_SEQUENCE) AS COUNT
+ FROM
+ GLASS_INFO T
+ LEFT JOIN DAMAGE T1
+ ON T.ENGINEER_ID = T1.ENGINEER_ID
+ AND T.GLASS_ID = T1.GLASS_ID
+ LEFT JOIN BIG_STORAGE_CAGE_DETAILS T2 ON T.ENGINEER_ID = T2.ENGINEER_ID
+ AND T.GLASS_ID = T2.GLASS_ID
+ WHERE
+ T1.GLASS_ID IS NULL
+ AND T2.GLASS_ID IS NULL
+ AND ( T.ENGINEER_ID
+ , T.TEMPERING_LAYOUT_ID ) IN ( SELECT DISTINCT ENGINEER_ID
+ , TEMPERING_LAYOUT_ID FROM BIG_STORAGE_CAGE_DETAILS WHERE STATE = 100 )
+ GROUP BY
+ T.ENGINEER_ID,
+ T.TEMPERING_LAYOUT_ID
+ HAVING
+ COUNT = 0
+ ORDER BY
+ T.TEMPERING_LAYOUT_ID
+ LIMIT 1
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0