新购新增类型下拉框去重
This commit is contained in:
parent
960aa87399
commit
deb1d7ad61
|
|
@ -175,21 +175,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
<select id="selectMaTypeList" parameterType="String" resultMap="MaTypeResult">
|
<select id="selectMaTypeList" parameterType="String" resultMap="MaTypeResult">
|
||||||
select m.type_id, m.type_name, m.parent_id, m.status, m.num, m.unit_id, m.unit_name, m.manage_type,
|
select DISTINCT m.type_id, m.type_name, m.parent_id, m.status, m.num, m.unit_id, m.unit_name, m.manage_type,
|
||||||
m.lease_price,m.eff_time, m.rent_price, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load,
|
m.lease_price,m.eff_time, m.rent_price, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load,
|
||||||
m.holding_time, m.warn_num, mtf.file_name photoName, mtf.file_url photoUrl,
|
m.holding_time, m.warn_num, mtf.file_name photoName, mtf.file_url photoUrl,
|
||||||
mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId,
|
mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId,
|
||||||
su.nick_name keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time,
|
su.nick_name keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time,
|
||||||
m.remark, m.company_id ,m.type_id id , m.type_name label
|
m.remark, m.company_id ,m.type_id id , m.type_name label
|
||||||
from ma_type m
|
from ma_type m
|
||||||
left join ma_prop_set mps on m.type_id = mps.type_id
|
left join ma_prop_set mps on m.type_id = mps.type_id and mps.`status`='0' and mps.del_flag='0'
|
||||||
left join ma_prop_info mpi on mps.prop_id = mpi.prop_id
|
left join ma_prop_info mpi on mps.prop_id = mpi.prop_id and mpi.`status`='0' and mpi.del_flag='0'
|
||||||
left join (select * from ma_type_file where file_type = '1') mtf on m.type_id = mtf.type_id
|
left join (select * from ma_type_file where file_type = '1') mtf on m.type_id = mtf.type_id
|
||||||
left join (select * from ma_type_file where file_type = '2') mtf2 on m.type_id = mtf2.type_id
|
left join (select * from ma_type_file where file_type = '2') mtf2 on m.type_id = mtf2.type_id
|
||||||
left join ma_type_keeper mtk on mtf.type_id = mtk.type_id
|
left join ma_type_keeper mtk on mtf.type_id = mtk.type_id
|
||||||
left join sys_user su on mtk.user_id = su.user_id
|
left join sys_user su on mtk.user_id = su.user_id
|
||||||
<where>
|
<where>
|
||||||
m.status = '0'
|
m.status = '0'
|
||||||
|
and m.del_flag = '0'
|
||||||
<if test="typeName != null and typeName !=''">
|
<if test="typeName != null and typeName !=''">
|
||||||
AND type_name like concat('%',#{typeName},'%')
|
AND type_name like concat('%',#{typeName},'%')
|
||||||
</if>
|
</if>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue