From 86adbb1544142dcfb48333dade822f81640607a6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 01 九月 2023 13:50:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/resources/mapper/MaterialMapper.xml | 79 +++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 37 deletions(-)
diff --git a/standard-server/src/main/resources/mapper/MaterialMapper.xml b/standard-server/src/main/resources/mapper/MaterialMapper.xml
index 3609c3b..53e1662 100644
--- a/standard-server/src/main/resources/mapper/MaterialMapper.xml
+++ b/standard-server/src/main/resources/mapper/MaterialMapper.xml
@@ -3,49 +3,43 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.MaterialMapper">
- <resultMap id="BaseResultMap" type="Material">
- <id property="id" column="id" jdbcType="INTEGER"/>
- <result property="code" column="code" jdbcType="VARCHAR"/>
- <result property="name" column="name" jdbcType="VARCHAR"/>
- <result property="type" column="type" jdbcType="INTEGER"/>
- <result property="state" column="state" jdbcType="INTEGER"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
- <result property="version" column="version" jdbcType="INTEGER"/>
+ <!--鏍囧噯MOM 宸︿晶浜旂骇鏍戝睍绀�-->
+ <resultMap id="selectTreeByMaterialMap" type="map">
+ <id property="id" column="type"/>
+ <collection property="children" resultMap="selectTreeByMaterialMaps1" javaType="List"/>
</resultMap>
-
- <resultMap id="materialTreeDto" type="materialTreeDto">
+ <resultMap id="selectTreeByMaterialMaps1" type="map">
+ <id property="name" column="father"/>
+ <collection property="children" resultMap="selectTreeByMaterialMaps2" javaType="List"/>
+ </resultMap>
+ <resultMap id="selectTreeByMaterialMaps2" type="map">
<id property="id" column="mid"/>
<result property="name" column="mname"/>
- <result property="type" column="type"/>
- <association property="children" resultMap="standardDto"/>
+ <collection property="children" resultMap="selectTreeByMaterialMaps3" javaType="List"/>
</resultMap>
- <resultMap id="standardDto" type="standardDto">
+ <resultMap id="selectTreeByMaterialMaps3" type="map">
<id property="id" column="sid"/>
<result property="name" column="sname"/>
- <association property="children" resultMap="specificationsDto"/>
+ <collection property="children" resultMap="selectTreeByMaterialMaps4" javaType="List"/>
</resultMap>
- <resultMap id="specificationsDto" type="specificationsDto">
+ <resultMap id="selectTreeByMaterialMaps4" type="map">
<id property="id" column="spid"/>
<result property="name" column="spname"/>
</resultMap>
-
- <select id="selectTreeByMaterial" resultMap="materialTreeDto">
- select m.type,
- m.id mid,
- m.name mname,
- s.id sid,
- s.name sname,
- s2.id spid,
- s2.name spname,
- p.id pid,
- p.name pname
- from (select type, id, name from material where state = 1) m
- left join (select id, name, material_id from standard where state = 1) s on m.id = s.material_id
- left join (select id, name, standard_id from specifications where state = 1) s2
- on s2.standard_id = s.id
- left join (select id, name, specifications_id from product where state = 1) p
- on s2.id = p.specifications_id
+ <select id="selectTreeByMaterial" resultMap="selectTreeByMaterialMap">
+ select m.type, #涓�绾х被鍨�
+ father, #浜岀骇浜у搧澶х被(4澶х被)
+ m.id mid, #涓夌骇鐗╂枡id
+ m.name mname, #涓夌骇鏍峰搧鍚嶇О
+ s.id sid, #鍥涚骇鏍囧噯id
+ s.name sname, #鍥涚骇鏍囧噯鍚�
+ sp.id spid, #浜旂骇鍨嬪彿id
+ sp.name spname #浜旂骇鍨嬪彿鍚�
+ from (select type, id, name, father from mom_ocean.material where state = 1) m
+ left join (select id, name, material_id from mom_ocean.standard where state = 1) s
+ on m.id = s.material_id
+ left join (select id, name, standard_id from mom_ocean.specifications where state = 1) sp
+ on sp.standard_id = s.id
</select>
<select id="selectMcodeId" resultType="com.yuanchu.mom.pojo.Material">
@@ -55,10 +49,10 @@
</select>
<select id="selectIdByCoNa" resultType="java.util.Map">
- select m.id '鐗╂枡id',
- st.id '瑙勬牸id',
- st.name '瑙勬牸鍚嶇О',
- sp.name '鍨嬪彿鍚嶇О'
+ select m.id '鐗╂枡id',
+ st.id '瑙勬牸id',
+ st.name '瑙勬牸鍚嶇О',
+ sp.name '鍨嬪彿鍚嶇О'
from mom_ocean.material m,
mom_ocean.standard st,
mom_ocean.specifications sp
@@ -67,4 +61,15 @@
and m.name = #{name}
and code = #{code}
</select>
+
+ <!--鏍规嵁鏍囧噯id鏌ヨ鐗╂枡-->
+ <select id="selFath" resultType="com.yuanchu.mom.pojo.Material">
+ select *
+ from mom_ocean.material
+ where state = 1
+ and id = (select material_id
+ from mom_ocean.standard
+ where standard.state = 1
+ and standard.id = #{id})
+ </select>
</mapper>
--
Gitblit v1.9.3