zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:使用记录查询

Browse Source
This commit is contained in:
FCL
2026-03-04 15:15:51 +08:00
parent f151e514db
commit db576a675d
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordPageReqVO.java
View File

@@ -75,10 +75,15 @@ public class DeviceUseRecordPageReqVO extends PageParam {
@Schema(description = "使用部门") @Schema(description = "使用部门")
private String deptName; private String deptName;
//===============查询字段=========
@Schema(description = "产品id查询") @Schema(description = "产品id查询")
private List<Long> productIdList; private List<Long> productIdList;
@Schema(description = "设备ID列表") @Schema(description = "设备ID列表")
private List<Long> deviceIdList; private List<Long> deviceIdList;
@Schema(description = "结束时间为空判断： 0-为空；1-不为空")
private String useTimeEndFlag;
} }

12
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceUseRecordMapper.java
View File

@@ -20,7 +20,8 @@ import org.apache.ibatis.annotations.Param;
public interface DeviceUseRecordMapper extends BaseMapperX<DeviceUseRecordDO> { public interface DeviceUseRecordMapper extends BaseMapperX<DeviceUseRecordDO> {
default PageResult<DeviceUseRecordDO> selectPage(DeviceUseRecordPageReqVO reqVO) { default PageResult<DeviceUseRecordDO> selectPage(DeviceUseRecordPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<DeviceUseRecordDO>()
LambdaQueryWrapperX<DeviceUseRecordDO> query = new LambdaQueryWrapperX<DeviceUseRecordDO>()
.eqIfPresent(DeviceUseRecordDO::getDeviceId, reqVO.getDeviceId()) .eqIfPresent(DeviceUseRecordDO::getDeviceId, reqVO.getDeviceId())
.likeIfPresent(DeviceUseRecordDO::getUserName, reqVO.getUserName()) .likeIfPresent(DeviceUseRecordDO::getUserName, reqVO.getUserName())
.eqIfPresent(DeviceUseRecordDO::getUserId, reqVO.getUserId()) .eqIfPresent(DeviceUseRecordDO::getUserId, reqVO.getUserId())
@@ -35,8 +36,13 @@ public interface DeviceUseRecordMapper extends BaseMapperX<DeviceUseRecordDO> {
.eqIfPresent(DeviceUseRecordDO::getDataSource, reqVO.getDataSource()) .eqIfPresent(DeviceUseRecordDO::getDataSource, reqVO.getDataSource())
.eqIfPresent(DeviceUseRecordDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) .eqIfPresent(DeviceUseRecordDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
.eqIfPresent(DeviceUseRecordDO::getRemark, reqVO.getRemark()) .eqIfPresent(DeviceUseRecordDO::getRemark, reqVO.getRemark())
.betweenIfPresent(DeviceUseRecordDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(DeviceUseRecordDO::getCreateTime, reqVO.getCreateTime());
.orderByDesc(DeviceUseRecordDO::getId)); if("0".equals(reqVO.getUseTimeEndFlag()))
query.isNull(DeviceUseRecordDO::getUseTimeEnd);
if("1".equals(reqVO.getUseTimeEndFlag()))
query.isNotNull(DeviceUseRecordDO::getUseTimeEnd);
query.orderByDesc(DeviceUseRecordDO::getId);
return selectPage(reqVO, query);
} }
IPage<DeviceInfomationWithProductVO> queryPageListWithCount(Page<DeviceInfomationWithProductVO> page, @Param("param") DeviceUseRecordPageReqVO param); IPage<DeviceInfomationWithProductVO> queryPageListWithCount(Page<DeviceInfomationWithProductVO> page, @Param("param") DeviceUseRecordPageReqVO param);