diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/DaHuaAccessRecordPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/DaHuaAccessRecordPageQry.java index d0bd02c..a37064b 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/DaHuaAccessRecordPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/DaHuaAccessRecordPageQry.java @@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) public class DaHuaAccessRecordPageQry extends PageQuery { - @ApiModelProperty(value = "人员编号") + @ApiModelProperty(value = "本地用户编号") private Long userId; @ApiModelProperty(value = "进出开始时间,格式:yyyy-MM-dd HH:mm:ss") diff --git a/web-infrastructure/src/main/resources/mapper/DaHuaAccessRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/DaHuaAccessRecordMapper.xml index eb620e5..0d8113a 100644 --- a/web-infrastructure/src/main/resources/mapper/DaHuaAccessRecordMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/DaHuaAccessRecordMapper.xml @@ -4,6 +4,15 @@ + + + + + + + - SELECT r.*, - m.mkmj_name + m.id AS relation_mkmj_id, + m.mkmj_name AS relation_mkmj_name, + g.passage_id AS relation_passage_id, + g.id AS relation_gate_id FROM dahua_access_record r - LEFT JOIN mkmj m ON r.mkmj_id = m.id AND m.delete_enum = 'FALSE' + LEFT JOIN mkmj_gate g + ON r.channel_code = g.third_code + AND g.delete_enum = 'FALSE' + LEFT JOIN mkmj m + ON g.mkmj_id = m.id + AND m.delete_enum = 'FALSE' + LEFT JOIN `user` u + ON u.user_id_card = BINARY TO_BASE64(TRIM(r.person_code)) + AND u.delete_enum = 'FALSE' WHERE r.delete_enum = 'FALSE' - AND r.person_id = #{params.userId} + AND u.id = #{params.userId} AND r.swing_time >= #{params.swingTimeStart}