haozq
/
ah_jjzhgd_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
haozq 2024-04-20 13:16:19 +08:00
parent 337dd253e6 e3caebf177
commit 49e8709898
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml
View File

@ -103,22 +103,17 @@
</select>
<select id="personnelCoordinatePoint" resultType="com.securitycontrol.entity.screen.vo.PersonnelControlVo">
SELECT
tbd.device_id AS deviceId,
group_concat(tdd.mode_name) AS modeName,
group_concat(tdv.val) AS val,
group_concat(su.phone) AS phone,
group_concat(su.org_name) AS orgName,
group_concat(su.user_name) AS userName
FROM
tb_bd_device tbd
LEFT JOIN tb_pro_bd tpb ON tbd.bd_id = tpb.id
LEFT JOIN tb_device_detail tdd ON tbd.device_id = tdd.device_id
LEFT JOIN tb_device_value tdv ON tdd.id = tdv.attribute_id
LEFT JOIN sys_user su ON tdv.val = su.user_id and tdd.mode_name = '绑定人'
WHERE
tpb.bid_code = #{bidCode} and tbd.devic_type = '1905'
GROUP BY
tbd.device_id
GROUP_CONCAT(tdd.mode_name) AS modeName,
GROUP_CONCAT(tdv.val) AS val,
ttp.user_name AS userName,
ttp.phone
FROM tb_bd_device tbd
INNER JOIN tb_pro_bd tpb ON tbd.bd_id = tpb.id AND tpb.del_flag = 0 AND tpb.bid_code = #{bidCode}
INNER JOIN tb_device_detail tdd ON tbd.device_id = tdd.device_id AND tdd.del_flag = 0
INNER JOIN tb_device_value tdv ON tdd.id = tdv.attribute_id
LEFT JOIN t_team_people ttp ON ttp.user_id = tdv.val AND ttp.del_falge = '0' AND tdd.mode_name = '绑定人'
WHERE tbd.devic_type = '1905' AND tbd.del_flag = 0
GROUP BY tbd.device_id
</select>
<select id="personnelHistoricalCoordinates"