通行

src/main/resources/mapper/DoorRecordMapper.xml

@@ -58,7 +58,7 @@
 
     <select id="queryDoorRecordsPaged" resultMap="BaseResultMap">
         SELECT
-        dr.record_id,su.name,dr.tenement_type,dr.create_date,dr.device_type,dr.device_name,dr.card_type,dr.record_type,dr.card_type_label,dr.abnormal
+        dr.record_id,su.name,dr.tenement_type,dr.create_date,dr.device_id,dr.device_type,dr.device_name,dr.card_type,dr.record_type,dr.card_type_label,dr.abnormal
         FROM door_record_2022 dr
         left JOIN sys_user su ON dr.person_id = su.person_id
         WHERE dr.del_flag = 0
@@ -71,8 +71,8 @@
         <if test="entity.endTime != null and entity.endTime !='' "><!-- 结束时间检索 -->
             and date_format(dr.create_date,'%Y-%m-%d') &lt;= date_format(#{entity.endTime},'%Y-%m-%d')
         </if>
-        <if test="entity.deviceName !=null and entity.deviceName != '' ">
-            and dr.device_name in(${entity.deviceName})
+        <if test="entity.deviceId !=null and entity.deviceId != '' ">
+            and dr.device_id in(${entity.deviceId})
         </if>
         <if test="entity.tenementType !=null and entity.tenementType != '' ">
             and dr.tenement_type = #{entity.tenementType}