From db576a675d3fd01863082b9f1a5748fb3a841fb5 Mon Sep 17 00:00:00 2001 From: FCL Date: Wed, 4 Mar 2026 15:15:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BD=BF=E7=94=A8=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/vo/DeviceUseRecordPageReqVO.java | 5 +++++ .../device/dal/mapper/DeviceUseRecordMapper.java | 12 +++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordPageReqVO.java index 83de5c38..03da8676 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordPageReqVO.java @@ -75,10 +75,15 @@ public class DeviceUseRecordPageReqVO extends PageParam { @Schema(description = "使用部门") private String deptName; + //===============查询字段========= + @Schema(description = "产品id查询") private List productIdList; @Schema(description = "设备ID列表") private List deviceIdList; + @Schema(description = "结束时间为空判断： 0-为空；1-不为空") + private String useTimeEndFlag; + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceUseRecordMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceUseRecordMapper.java index 119721e3..9c82c9de 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceUseRecordMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceUseRecordMapper.java @@ -20,7 +20,8 @@ import org.apache.ibatis.annotations.Param; public interface DeviceUseRecordMapper extends BaseMapperX { default PageResult selectPage(DeviceUseRecordPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() + + LambdaQueryWrapperX query = new LambdaQueryWrapperX() .eqIfPresent(DeviceUseRecordDO::getDeviceId, reqVO.getDeviceId()) .likeIfPresent(DeviceUseRecordDO::getUserName, reqVO.getUserName()) .eqIfPresent(DeviceUseRecordDO::getUserId, reqVO.getUserId()) @@ -35,8 +36,13 @@ public interface DeviceUseRecordMapper extends BaseMapperX { .eqIfPresent(DeviceUseRecordDO::getDataSource, reqVO.getDataSource()) .eqIfPresent(DeviceUseRecordDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) .eqIfPresent(DeviceUseRecordDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(DeviceUseRecordDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(DeviceUseRecordDO::getId)); + .betweenIfPresent(DeviceUseRecordDO::getCreateTime, reqVO.getCreateTime()); + 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 queryPageListWithCount(Page page, @Param("param") DeviceUseRecordPageReqVO param);