Merge remote-tracking branch 'origin/test' into test

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<Long> productIdList;
 
     @Schema(description = "设备ID列表")
     private List<Long> deviceIdList;
 
+    @Schema(description = "结束时间为空判断： 0-为空；1-不为空")
+    private String useTimeEndFlag;
+
 }

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<DeviceUseRecordDO> {
 
     default PageResult<DeviceUseRecordDO> selectPage(DeviceUseRecordPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<DeviceUseRecordDO>()
+
+        LambdaQueryWrapperX<DeviceUseRecordDO> query = new LambdaQueryWrapperX<DeviceUseRecordDO>()
                 .eqIfPresent(DeviceUseRecordDO::getDeviceId, reqVO.getDeviceId())
                 .likeIfPresent(DeviceUseRecordDO::getUserName, reqVO.getUserName())
                 .eqIfPresent(DeviceUseRecordDO::getUserId, reqVO.getUserId())
@@ -35,8 +36,13 @@ public interface DeviceUseRecordMapper extends BaseMapperX<DeviceUseRecordDO> {
                 .eqIfPresent(DeviceUseRecordDO::getDataSource, reqVO.getDataSource())
                 .eqIfPresent(DeviceUseRecordDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .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);