From 8b7ae914554652266b31f3bb4237106f1b220cc7 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 20 十月 2025 16:02:11 +0800
Subject: [PATCH] 阿尔及利亚代码逻辑修改，页面布局修改
---
hangzhoumesParent/common/servicebase/src/main/resources/mapper/UpPattenUsageMapper.xml | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/UpPattenUsageMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/UpPattenUsageMapper.xml
index 951829c..6af689e 100644
--- a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/UpPattenUsageMapper.xml
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/UpPattenUsageMapper.xml
@@ -13,19 +13,38 @@
<result column="state" property="state"/>
<result column="group_number" property="groupNumber"/>
</resultMap>
- <select id="queryRawGlassByEngineeringId" resultType="com.mes.uppattenusage.entity.vo.UpPattenUsageVO">
- SET @prev_width := NULL;
- SET @prev_height := NULL;
- SET @counter := 0;
-
- SELECT t.*,
- @counter := IF(@prev_width = width and @prev_height = height, @counter, @counter + 1) AS group_number,
- @prev_width := width,
- @prev_height := height
- FROM up_patten_usage t
- where t.engineering_id = #{engineeringId}
- and t.state = 0
- ORDER BY t.layout_sequence
+ <select id="queryRawGlassByEngineeringId" resultMap="baseMap">
+ SELECT
+ t.*,
+ t.group_number
+ FROM (
+ SELECT
+ upu.*,
+ -- 璁＄畻缁勫彿
+ @counter := IF(@prev_width = upu.width AND @prev_height = upu.height,
+ @counter,
+ @counter + 1) AS group_number,
+ -- 鍙橀噺璧嬪��
+ @prev_width := upu.width,
+ @prev_height := upu.height
+ FROM
+ up_patten_usage upu,
+ -- 鍏抽敭锛氱敤铏氭嫙琛ㄥ垵濮嬪寲鍙橀噺锛屾浛浠ｅ崟鐙殑SET璇彞
+ (SELECT @prev_width := NULL, @prev_height := NULL, @counter := 0) AS init_var
+ WHERE
+ upu.engineering_id = #{engineeringId}
+ AND upu.state = 0
+ ORDER BY
+ upu.layout_sequence
+ ) AS t
+ </select>
+ <select id="queryFinishByEngineering" resultType="java.lang.Integer">
+ SELECT id
+ FROM up_patten_usage
+ WHERE engineering_id IN (SELECT engineer_id FROM engineering WHERE station_cell = #{stationCell} AND state = 1)
+ and state = 0
+ order by id
+ LIMIT ${finishCount}
</select>
--
Gitblit v1.8.0