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-04 20:21:27 +08:00
parent 5df832845c
commit 980527ffa2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java
View File

@ -17,6 +17,7 @@ public class DevInfoVo extends DevInfo {
private String groupName; private String groupName;
/* 装备名称 child */ /* 装备名称 child */
private String deviceName; private String deviceName;
private int collectId;
private String companyName; private String companyName;
private String keyWord; private String keyWord;
} }

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

@ -79,9 +79,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectDevInfoByMaId" parameterType="Long" resultType="com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo"> <select id="selectDevInfoByMaId" parameterType="Long" resultType="com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo">
select d.*,c.company_name,ty.type_name as device_name,ty.parent_name as group_name,ty.grandpa_name as type_name select d.*,c.company_name,ty.type_name as device_name,ty.parent_name as group_name,ty.grandpa_name as type_name,col.id as collect_id
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 ( left join (
select tt.*, pp.type_name as grandpa_name from 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 (select t.*, p.type_name as parent_name,p.type_id as p_type_id, p.parent_id as p_parent_id