From ed722acfaf6f10ba2e6c3e1b4d68a2552bdde245 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 19 三月 2025 16:51:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageMapper.xml | 77 ++++++++++++++++++++++++++++++++------
1 files changed, 65 insertions(+), 12 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageMapper.xml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageMapper.xml
index d9b1ce4..1e85334 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageMapper.xml
@@ -1,29 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mes.bigstorage.mapper.BigStorageCageMapper">
+ <resultMap id="downStorageCageDetails" type="com.mes.bigstorage.entity.dto.BigStorageSummaryDTO">
+ <result column="engineer_id" property="engineerId"/>
+ <result column="countTemp" property="countTemp"/>
+ <result column="countGlass" property="countGlass"/>
+ <result column="area" property="area"/>
+ <result column="fullTemp" property="fullTemp"/>
+ <result column="countSlot" property="countSlot"/>
+ <result column="percent" property="percent"/>
+ </resultMap>
<select id="queryFreeDeviceByUsed" resultType="java.lang.Integer">
SELECT T.DEVICE_ID
FROM BIG_STORAGE_CAGE T
- LEFT JOIN (SELECT * FROM BIG_STORAGE_CAGE_DETAILS WHERE STATE NOT IN (101, 200, 201)) T1
+ LEFT JOIN (SELECT * FROM BIG_STORAGE_CAGE_DETAILS WHERE STATE NOT IN (101, 8, 9)) T1
ON T.SLOT = T1.SLOT
WHERE T.MAX_THICKNESS >= #{thickness}
AND T.ENABLE_STATE = 1
GROUP BY T.DEVICE_ID
- ORDER BY COUNT(DISTINCT T1.TEMPERING_LAYOUT_ID),
+ ORDER BY min(T.MAX_THICKNESS),
+ COUNT(DISTINCT T1.ENGINEER_ID), COUNT(DISTINCT T1.TEMPERING_LAYOUT_ID),
COUNT(DISTINCT T1.SLOT)
</select>
- <select id="queryFreeDeviceByNotUsed" resultType="java.lang.Integer">
- SELECT T.DEVICE_ID
- FROM BIG_STORAGE_CAGE T
- LEFT JOIN (SELECT * FROM BIG_STORAGE_CAGE_DETAILS WHERE STATE NOT IN (101, 200, 201)) T1
- ON T.SLOT = T1.SLOT
- WHERE T.MAX_THICKNESS >= #{thickness}
- AND T.ENABLE_STATE = 1
- GROUP BY T.DEVICE_ID
- ORDER BY COUNT(DISTINCT T1.TEMPERING_LAYOUT_ID),
- COUNT(DISTINCT T.SLOT) - COUNT(DISTINCT T1.SLOT) DESC
+ <select id="selectBigStorageSummary" resultType="com.mes.bigstorage.entity.dto.BigStorageSummaryDTO">
+ SELECT
+ engineer_id as engineerId,
+ count( tempering_layout_id ) AS countTemp,
+ sum( countGlass ) AS countGlass,
+ round( sum( area ), 2 ) as area,
+ sum( fullTemp ) AS fullTemp,
+ sum( countSlot ) AS countSlot,
+ sum( countGlass )/ sum( countGlass1 )* 100 AS percent,
+ thickness
+ FROM
+ (
+ SELECT
+ bscd.engineer_id,
+ bscd.tempering_layout_id,
+ count(*) AS countGlass,
+ sum( bscd.width * bscd.height / 1000000 ) AS area,
+ IF
+ ( gi.countGlass1 = count(*), 1, 0 ) AS fullTemp,
+ count( DISTINCT bscd.slot ) AS countSlot,
+ countGlass1,
+ gi.thickness
+ FROM
+ big_storage_cage_details bscd
+ INNER JOIN ( SELECT engineer_id, tempering_layout_id, count(*) AS countGlass1, thickness FROM glass_info GROUP BY engineer_id, tempering_layout_id ) gi ON bscd.engineer_id = gi.engineer_id
+ AND bscd.tempering_layout_id = gi.tempering_layout_id
+ WHERE
+ bscd.state = 100
+ GROUP BY
+ bscd.engineer_id,
+ bscd.tempering_layout_id
+ ) AS cageSummary
+ GROUP BY
+ engineer_id
+ ORDER BY
+ percent DESC,
+ countSlot DESC,
+ thickness DESC
</select>
+
+
+
+ <!-- <select id="queryFreeDeviceByNotUsed" resultType="java.lang.Integer">-->
+ <!-- SELECT T.DEVICE_ID-->
+ <!-- FROM BIG_STORAGE_CAGE T-->
+ <!-- LEFT JOIN (SELECT * FROM BIG_STORAGE_CAGE_DETAILS WHERE STATE NOT IN (101, 8, 9)) T1-->
+ <!-- ON T.SLOT = T1.SLOT-->
+ <!-- WHERE T.MAX_THICKNESS >= #{thickness}-->
+ <!-- AND T.ENABLE_STATE = 1-->
+ <!-- GROUP BY T.DEVICE_ID-->
+ <!-- ORDER BY COUNT(DISTINCT T1.ENGINEER_ID)-->
+ <!-- COUNT(DISTINCT T1.TEMPERING_LAYOUT_ID),-->
+ <!-- COUNT(DISTINCT T.SLOT) - COUNT(DISTINCT T1.SLOT) DESC-->
+ <!-- </select>-->
</mapper>
--
Gitblit v1.8.0