From 18648905bd0fd3b0dd1cf39a88ff90ec77dc5e30 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 20 九月 2023 10:28:11 +0800
Subject: [PATCH] 修改 9.20
---
production-server/src/main/resources/mapper/ManualTechnologyMapper.xml | 61 +++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 7 deletions(-)
diff --git a/production-server/src/main/resources/mapper/ManualTechnologyMapper.xml b/production-server/src/main/resources/mapper/ManualTechnologyMapper.xml
index 743e3ab..b6fe2a0 100644
--- a/production-server/src/main/resources/mapper/ManualTechnologyMapper.xml
+++ b/production-server/src/main/resources/mapper/ManualTechnologyMapper.xml
@@ -1,15 +1,62 @@
<?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.yuanchu.mom.mapper.ManualTechnologyMapper">
- <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="technologyId" column="manufacture_order_id"/>
+ </resultMap>
+
+ <select id="seleDatil" resultMap="seleDatilMap">
select manual_technology.id,
techfather,
techname,
- device_group,
- name
+ device_group
from mom_ocean.manual_technology
- left join mom_ocean.device
- on device.id = device_id
- where manufacture_order_id=#{manOrdId}
+ where manufacture_order_id = #{manOrdId}
</select>
-</mapper>
\ No newline at end of file
+
+ <resultMap id="selectListTowTreeFirstMap" type="map">
+ <id property="techfather" column="techfather"/>
+ <collection property="children" javaType="list" resultMap="selectListTowTreeSecondMap"/>
+ </resultMap>
+
+ <resultMap id="selectListTowTreeSecondMap" type="map">
+ <id property="id" column="id"/>
+ <result property="techname" column="techname"/>
+ <result property="deviceName" column="name"/>
+ <result property="startTime" column="start_time"/>
+ <result property="endTime" column="end_time"/>
+ <result property="period" column="period"/>
+ </resultMap>
+ <select id="selectListTowTree" resultMap="selectListTowTreeFirstMap">
+ SELECT p.`id`,
+ t.`techfather`,
+ t.`techname`,
+ d.`name`,
+ DATE_FORMAT(p.`start_time`, '%Y-%m-%d') start_time,
+ DATE_FORMAT(p.`end_time`, '%Y-%m-%d') end_time,
+ p.`period`
+ FROM manufacture_order_process p
+ LEFT JOIN device d ON d.`id` = p.`device_id`
+ LEFT JOIN manual_technology t ON t.`id` = p.`manual_technology_id`
+ WHERE p.`state` = 1
+ AND p.`manufacture_scheduling_id` = #{schedulingId}
+ ORDER BY p.`create_time` DESC
+ </select>
+
+ <!--鏍规嵁鐢熶骇璁㈠崟id鏌ヨ鎵�鏈�(鍊掑簭)-->
+ <select id="selAllByMoId" resultType="com.yuanchu.mom.pojo.ManualTechnology">
+ select *
+ from mom_ocean.manual_technology
+ where state = 1
+ and manufacture_order_id = #{id}
+ order by id desc
+ </select>
+</mapper>
--
Gitblit v1.9.3