From 3df859f5bf52a1e80c7dc2ac2a2e5386142ab2c3 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 10 七月 2025 08:17:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

---
 hangzhoumesParent/common/servicebase/src/main/resources/mapper/TemperingGlassInfoMapper.xml |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/TemperingGlassInfoMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/TemperingGlassInfoMapper.xml
index 55b503b..a88f715 100644
--- a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/TemperingGlassInfoMapper.xml
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/TemperingGlassInfoMapper.xml
@@ -1,6 +1,11 @@
 <?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.temperingglass.mapper.TemperingGlassInfoMapper">
+
+    <resultMap id="baseMap" type="com.mes.temperingglass.entity.TemperingGlassInfo">
+        <result column="engineer_id" property="engineerId"/>
+        <result column="tempering_layout_id" property="temperingLayoutId"/>
+    </resultMap>
     <insert id="saveBatch">
         INSERT INTO tempering_glass_info (glass_id, flow_card_id, glass_type, width, height, thickness, films_id,
         ishorizontal, tempering_layout_id,
@@ -12,5 +17,12 @@
             #{item.angle}, #{item.state}, #{item.slot}, #{item.engineerId}, 0)
         </foreach>
     </insert>
+    <select id="queryEngineerAndLayoutId" resultMap="baseMap">
+        select top 3 engineer_id,tempering_layout_id
+        from tempering_glass_info
+        where state = 1 and deleted = 0
+        group by engineer_id, tempering_layout_id
+        order by min(id) desc
+    </select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0