dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

围栏进出记录-导出-报错

Browse Source
This commit is contained in:
daiyongfei
2025-09-26 11:48:20 +08:00
parent 3859c20081
commit b7c81419a4
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceFenceAccessRecordMapper.java
View File

@ -28,7 +28,7 @@ public interface DeviceFenceAccessRecordMapper extends BaseMapperPlus<DeviceFenc
*/ */
Page<DeviceFenceAccessRecordVo> selectVoPageWithFenceAndDeviceName(Page<DeviceFenceAccessRecord> page, @Param(Constants.WRAPPER) Wrapper<DeviceFenceAccessRecord> wrapper); Page<DeviceFenceAccessRecordVo> selectVoPageWithFenceAndDeviceName(Page<DeviceFenceAccessRecord> page, @Param(Constants.WRAPPER) Wrapper<DeviceFenceAccessRecord> wrapper);
List<DeviceFenceAccessRecordVo> selectVoPageWithFenceAndDeviceName(@Param(Constants.WRAPPER) Wrapper<DeviceFenceAccessRecord> wrapper); List<DeviceFenceAccessRecordVo> selectVoPageWithFenceAndDeviceName(@Param(Constants.WRAPPER) Wrapper<DeviceFenceAccessRecord> wrapper,@Param("fenceName") String fenceName);
/** /**
* 分页查询围栏进出记录列表（纯XML形式） * 分页查询围栏进出记录列表（纯XML形式）

6
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceFenceAccessRecordServiceImpl.java
View File

@ -69,7 +69,7 @@ public class DeviceFenceAccessRecordServiceImpl implements IDeviceFenceAccessRec
@Override @Override
public List<DeviceFenceAccessRecordVo> queryList(DeviceFenceAccessRecordBo bo) { public List<DeviceFenceAccessRecordVo> queryList(DeviceFenceAccessRecordBo bo) {
LambdaQueryWrapper<DeviceFenceAccessRecord> lqw = buildQueryWrapper(bo); LambdaQueryWrapper<DeviceFenceAccessRecord> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoPageWithFenceAndDeviceName(lqw); return baseMapper.selectVoPageWithFenceAndDeviceName(lqw, bo.getFenceName());
} }
@ -86,9 +86,7 @@ public class DeviceFenceAccessRecordServiceImpl implements IDeviceFenceAccessRec
lqw.eq(bo.getAccuracy() != null, DeviceFenceAccessRecord::getAccuracy, bo.getAccuracy()); lqw.eq(bo.getAccuracy() != null, DeviceFenceAccessRecord::getAccuracy, bo.getAccuracy());
lqw.eq(bo.getEventTime() != null, DeviceFenceAccessRecord::getEventTime, bo.getEventTime()); lqw.eq(bo.getEventTime() != null, DeviceFenceAccessRecord::getEventTime, bo.getEventTime());
lqw.eq(bo.getCreateTime() != null, DeviceFenceAccessRecord::getCreateTime, bo.getCreateTime()); lqw.eq(bo.getCreateTime() != null, DeviceFenceAccessRecord::getCreateTime, bo.getCreateTime());
if (StringUtils.isNotBlank(bo.getFenceName())) {
params.put("fenceName", bo.getFenceName());
}
return lqw; return lqw;
} }

7
fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceFenceAccessRecordMapper.xml
View File

@ -24,16 +24,15 @@
LEFT JOIN device d ON r.device_id = d.id LEFT JOIN device d ON r.device_id = d.id
${ew.customSqlSegment} ${ew.customSqlSegment}
<where> <where>
<if test="ew.params != null"> <if test="fenceName != null and fenceName != ''">
<if test="ew.params.fenceName != null and ew.params.fenceName != ''"> AND f.name LIKE CONCAT('%', #{fenceName}, '%')
AND f.name LIKE CONCAT('%', #{ew.params.fenceName}, '%')
</if>
</if> </if>
</where> </where>
ORDER BY r.id ASC ORDER BY r.id ASC
</select> </select>
<!-- 分页查询围栏进出记录列表（纯XML形式） --> <!-- 分页查询围栏进出记录列表（纯XML形式） -->
<select id="selectVoPageByXml" resultType="com.fuyuanshen.equipment.domain.vo.DeviceFenceAccessRecordVo"> <select id="selectVoPageByXml" resultType="com.fuyuanshen.equipment.domain.vo.DeviceFenceAccessRecordVo">
SELECT r.id, SELECT r.id,