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-05 14:40:39 +08:00
parent 84ff331b66
commit 4e05bc5415
2 changed files with 4 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

@ -25,4 +25,5 @@ public class DevInfoVo extends DevInfo {
private String keyWord; private String keyWord;
/* 是否审核通过, ma_up_off:status, 1=通过, 2驳回 */ /* 是否审核通过, ma_up_off:status, 1=通过, 2驳回 */
private String isAudit; private String isAudit;
private Long searchNum;
} }

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

@ -88,11 +88,13 @@ 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,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 select d.*,c.company_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
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 ( 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