From 55e5fcc8df938fefc94103149dfe3acd328abfd6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 30 八月 2023 18:00:54 +0800
Subject: [PATCH] MOM系统-8-30
---
production-server/src/main/resources/mapper/ManualTechnologyMapper.xml | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/production-server/src/main/resources/mapper/ManualTechnologyMapper.xml b/production-server/src/main/resources/mapper/ManualTechnologyMapper.xml
index a85ffba..4613a5a 100644
--- a/production-server/src/main/resources/mapper/ManualTechnologyMapper.xml
+++ b/production-server/src/main/resources/mapper/ManualTechnologyMapper.xml
@@ -20,6 +20,11 @@
WHEN id =#{manualTechnologie.id} THEN #{manualTechnologie.endTime}
</foreach>
</trim>
+ <trim prefix="scheduling_number=case" suffix="end,">
+ <foreach collection="manualTechnologies" item="manualTechnologie">
+ WHEN id =#{manualTechnologie.id} THEN #{schedulingNumber}
+ </foreach>
+ </trim>
</trim>
<where>
<foreach collection="manualTechnologies" separator="or" item="manualTechnologie">
@@ -28,25 +33,29 @@
</where>
</update>
- <select id="seleDatil" resultType="java.util.Map">
+ <resultMap id="seleDatilMap" type="map">
+ <id property="lable" column="techfather"/>
+ <collection property="children" resultMap="seleDatilTowMap" javaType="List"/>
+ </resultMap>
+
+ <resultMap id="seleDatilTowMap" type="map">
+ <id property="lable" column="techname"/>
+ <result property="id" column="id"/>
+ <result property="deviceGroup" column="device_group"/>
+ <result property="deviceName" column="name"/>
+ <result property="technologyId" column="manufacture_order_id"/>
+ </resultMap>
+
+ <select id="seleDatil" resultMap="seleDatilMap">
select manual_technology.id,
techfather,
techname,
device_group,
- name
+ name,
+ manufacture_order_id
from mom_ocean.manual_technology
left join mom_ocean.device
on device.id = device_id
where manufacture_order_id = #{manOrdId}
</select>
- <!--鏌ヨ鎵�鏈夎澶囧垪琛�-->
- <select id="selectAllDev" resultType="java.util.Map">
- select distinct manual_technology.id,
- device_group,
- name
- from mom_ocean.manual_technology
- left join mom_ocean.device
- on device.id = manual_technology.device_id
- order by device_group
- </select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3