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-06 19:07:39 +08:00
parent 5a3d7df4e7
commit a3fc5f041a
1 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,11 +42,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql> </sql>
<select id="selectDevInfoList" parameterType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo" resultType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo"> <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,c.company_name ,u.type, u.id as up_id select d.*,t.type_name as device_name,t.parent_name as group_name,c.company_name
from ma_dev_info d from ma_dev_info d
left join ma_type_info t on d.type_id = t.type_id 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 bm_company_info c on d.own_co = c.company_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
<where> <where>
<if test="maId != null "> and d.ma_id = #{maId}</if> <if test="maId != null "> and d.ma_id = #{maId}</if>
<if test="code != null and code != ''"> and d.code = #{code}</if> <if test="code != null and code != ''"> and d.code = #{code}</if>
@ -108,45 +114,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectDevInfoHotList" parameterType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo" resultType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo"> <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 select d.*,t.type_name as device_name,t.parent_name as group_name,c.company_name,search_num
from ma_dev_info d 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 bm_company_info c on d.own_co = c.company_id 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_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 order by h.search_num
</select> </select>
<!-- <select id="selectDevInfoHotList" parameterType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo" resultType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo">-->
<!-- <select id="selectDevInfoByMaId" parameterType="Long" resultType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo">--> <!-- select d.*,c.company_name,search_num,t.type_name-->
<!-- select d.*,c.company_name,c.create_time as company_create_time,c.logo_url as company_logo_url,-->
<!-- c.auth_phone,ty.type_name as device_name,-->
<!-- ty.parent_name as group_name,ty.grandpa_name as type_name,-->
<!-- col.id as collect_id, up.status as is_audit,h.search_num-->
<!-- from ma_dev_info d--> <!-- from ma_dev_info d-->
<!-- left join bm_company_info c on d.own_co = c.company_id--> <!-- 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_hot_search h on d.ma_id = h.ma_id-->
<!-- left join (--> <!-- left join ma_type_info t on d.type_id = t.type_id-->
<!-- select tt.*, pp.type_name as grandpa_name from--> <!-- order by h.search_num-->
<!-- (select t.*, p.type_name as parent_name,p.type_id as p_type_id, p.parent_id as p_parent_id-->
<!-- from ma_type_info t-->
<!-- left join ma_type_info p on t.parent_id=p.type_id) tt-->
<!-- left join ma_type_info pp on tt.p_parent_id = pp.type_id-->
<!-- ) ty on d.type_id=ty.type_id-->
<!-- where d.ma_id = #{maId}-->
<!-- </select>--> <!-- </select>-->
<select id="selectDevInfoByMaId" parameterType="Long" resultType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo"> <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, 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, c.auth_phone,ty.type_name as device_name,
ty.parent_name as group_name,ty.grandpa_name as type_name,
col.id as collect_id, up.status as is_audit,h.search_num col.id as collect_id, up.status as is_audit,h.search_num
from ma_dev_info d from ma_dev_info d
left join bm_company_info c on d.own_co = c.company_id 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_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_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_hot_search h on d.ma_id = h.ma_id
left join ma_type_info t on d.type_id = t.type_id left join (
select tt.*, pp.type_name as grandpa_name from
(select t.*, p.type_name as parent_name,p.type_id as p_type_id, p.parent_id as p_parent_id
from ma_type_info t
left join ma_type_info p on t.parent_id=p.type_id) tt
left join ma_type_info pp on tt.p_parent_id = pp.type_id
) ty on d.type_id=ty.type_id
where d.ma_id = #{maId} where d.ma_id = #{maId}
</select> </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 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 SELECT s.dic_id, s.file_name as name,s.file_url as url