bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

This commit is contained in:
sxu 2023-12-09 20:04:36 +08:00
parent 7b1655172a
commit ebd9347a87
1 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
View File

@ -48,18 +48,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectDevInfoList" parameterType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo" resultType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo">
select d.*,t.type_name as device_name,t.parent_name as group_name,c.company_name,u.type as type
select d.*,mt1.type_name as device_name, mt2.type_name as group_name, mt3.type_name as type_name,c.company_name,u.type as type
from ma_dev_info d
left join (select t.*, p.type_name as parent_name
from ma_type_info t
left join ma_type_info p on t.parent_id=p.type_id) t on d.type_id = t.type_id
left join ma_type_info mt1 on d.type_id = mt1.type_id
left join ma_type_info mt2 on mt1.parent_id = mt2.type_id
left join ma_type_info mt3 on mt2.parent_id = mt3.type_id
left join bm_company_info c on d.own_co = c.company_id
left join ma_up_off u on d.ma_id = u.ma_id
-- select d.*,t.type_name,c.company_name ,u.type, u.id as up_id
-- from ma_dev_info d
-- left join ma_type_info t on d.type_id = t.type_id
-- left join bm_company_info c on d.own_co = c.company_id
-- left join ma_up_off u on d.ma_id = u.ma_id
left join ma_up_off u on d.ma_id = u.ma_id
<where>
<if test="maId != null "> and d.ma_id = #{maId}</if>
<if test="code != null and code != ''"> and d.code = #{code}</if>
@ -104,7 +99,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isActive != null and isActive != ''"> and d.is_active = #{isActive}</if>
<if test="keyWord != null and keyWord != ''">
and (
locate(#{keyWord},t.type_name) > 0
locate(#{keyWord},mt1.type_name) > 0
or locate(#{keyWord},mt2.type_name) > 0
or locate(#{keyWord},mt3.type_name) > 0
or locate(#{keyWord},c.company_name) > 0
or locate(#{keyWord},d.ma_id) > 0
or locate(#{keyWord},d.model_name) > 0
@ -232,14 +229,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
order by h.search_num
</select>
<!-- <select id="selectDevInfoHotList" parameterType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo" resultType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo">-->
<!-- select d.*,c.company_name,search_num,t.type_name-->
<!-- from ma_dev_info d-->
<!-- left join bm_company_info c on d.own_co = c.company_id-->
<!-- left join ma_hot_search h on d.ma_id = h.ma_id-->
<!-- left join ma_type_info t on d.type_id = t.type_id-->
<!-- order by h.search_num-->
<!-- </select>-->
<select id="selectDevInfoByMaId" parameterType="Long" resultType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo">
select d.*,c.company_name,c.create_time as company_create_time,c.logo_url as company_logo_url,
@ -257,18 +246,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join ma_type_info mt3 on mt2.parent_id = mt3.type_id
where d.ma_id = #{maId} and d.is_active='1'
</select>
<!-- <select id="selectDevInfoByMaId" parameterType="Long" resultType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo">-->
<!-- select d.*,c.company_name,c.create_time as company_create_time,c.logo_url as company_logo_url,-->
<!-- c.auth_phone,t.type_name,-->
<!-- col.id as collect_id, up.status as is_audit,h.search_num-->
<!-- from ma_dev_info d-->
<!-- left join bm_company_info c on d.own_co = c.company_id-->
<!-- left join ma_user_collect col on d.ma_id = col.ma_id-->
<!-- left join ma_up_off up on d.ma_id = up.ma_id-->
<!-- left join ma_hot_search h on d.ma_id = h.ma_id-->
<!-- left join ma_type_info t on d.type_id = t.type_id-->
<!-- where d.ma_id = #{maId}-->
<!-- </select>-->
<select id="getFilesByMaId" parameterType="Long" resultType="com.bonus.zlpt.common.core.domain.system.SysFile">
SELECT s.dic_id, s.file_name as name,s.file_url as url