Commit 99451bd1 authored by 盖献康's avatar 盖献康

修改 bug

parent a7d940ff
......@@ -25,7 +25,7 @@ import org.springframework.data.annotation.Transient;
public class DoorRecord extends CyIdEntity<DoorRecord> {
@Excel(name = "行人员姓名", orderNum = "1", width = 20)
@Excel(name = "行人员姓名", orderNum = "1", width = 20)
//通行人员姓名
private String name;
......
......@@ -221,7 +221,7 @@ public class DoorRecordServiceImpl extends ServiceImpl<DoorRecordRepository, Doo
if (deviceType.equals("1")) {
doorRecordList.get(i).setDeviceType("进入");
} else if (deviceType.equals("2")) {
doorRecordList.get(i).setDeviceType("出入");
doorRecordList.get(i).setDeviceType("离开");
}
}
//获取登记结果
......
......@@ -34,7 +34,7 @@
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
FROM door_record_2022 dr
left JOIN sys_user su ON dr.person_id = su.person_id
left JOIN sys_user su ON dr.user_id = su.business_id
WHERE dr.del_flag = 0
<if test="entity.deviceType !=null and entity.deviceType != '' ">
and dr.device_type = #{entity.deviceType}
......@@ -136,7 +136,7 @@
dr.card_type_label,
dr.abnormal
FROM door_record_2022 dr
left JOIN sys_user su ON dr.person_id = su.person_id
left JOIN sys_user su ON dr.user_id = su.business_id
WHERE dr.del_flag = 0
and record_id = #{recordId}
</select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment