新增分页查询

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/mysql/museummodel/MuseummodelMapper.java

@@ -28,22 +28,36 @@ public interface MuseummodelMapper extends BaseMapperX<MuseummodelDO> {
 
     //分页查询
     default PageResult<MuseummodelDO> selectPage(MuseummodelPageReqVO reqVO) {
-        MPJLambdaWrapper<MuseummodelDO>mpjLambdaWrapper = new MPJLambdaWrapper<>();
-        mpjLambdaWrapper.leftJoin(MuseumInfoDO.class,MuseumInfoDO::getSampleId,MuseummodelDO::getSpecimenNumber)
+        MPJLambdaWrapper<MuseummodelDO> mpjLambdaWrapper = new MPJLambdaWrapper<>();
+        mpjLambdaWrapper.leftJoin(MuseumInfoDO.class, MuseumInfoDO::getSampleId, MuseummodelDO::getSpecimenNumber)
                 .selectAll(MuseummodelDO.class)// 查询 List
-                .selectAssociation(MuseummodelDO.class,MuseummodelDO::getMuseumInfo);
+                .selectAssociation(MuseummodelDO.class, MuseummodelDO::getMuseumInfo);
 
-                return selectPage(reqVO, mpjLambdaWrapper);
-        return selectPage(reqVO, new LambdaQueryWrapperX<MuseummodelDO>()
-                .likeIfPresent(MuseummodelDO::getSpecimenName, reqVO.getSpecimenName())// 如果 SpecimenName 不为空，则进行 like 查询
+        mpjLambdaWrapper.likeIfPresent(MuseummodelDO::getSpecimenName, reqVO.getSpecimenName())// 如果 SpecimenName 不为空，则进行 like 查询
                 .likeIfPresent(MuseummodelDO::getSpecimenType, reqVO.getSpecimenType())
                 .likeIfPresent(MuseummodelDO::getModelWay, reqVO.getModelWay())
                 .likeIfPresent(MuseummodelDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(MuseummodelDO::getSpecimenNumber, reqVO.getSpecimenNumber()) // 如果 SpecimenNumber 不为空，则进行 = 查询
-                .betweenIfPresent(MuseummodelDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime()) // 如果 create 不为空，则进行 between 查询
-                .orderByDesc(MuseummodelDO::getId)); // 按照 id 倒序
+                .betweenIfPresent(MuseummodelDO::getCreateTime, reqVO.getRemark(), reqVO.getId()) // 如果 create 不为空，则进行 between 查询
+                .orderByDesc(MuseummodelDO::getId); // 按照 id 倒序
+
+
+        return selectPage(reqVO, mpjLambdaWrapper);
 
     }
+}
+
+
+//        return selectPage(reqVO, new LambdaQueryWrapperX<MuseummodelDO>()
+//                .likeIfPresent(MuseummodelDO::getSpecimenName, reqVO.getSpecimenName())// 如果 SpecimenName 不为空，则进行 like 查询
+//                .likeIfPresent(MuseummodelDO::getSpecimenType, reqVO.getSpecimenType())
+//                .likeIfPresent(MuseummodelDO::getModelWay, reqVO.getModelWay())
+//                .likeIfPresent(MuseummodelDO::getRemark, reqVO.getRemark())
+//                .eqIfPresent(MuseummodelDO::getSpecimenNumber, reqVO.getSpecimenNumber()) // 如果 SpecimenNumber 不为空，则进行 = 查询
+//                .betweenIfPresent(MuseummodelDO::getCreateTime, reqVO.getRemark(), reqVO.getId()) // 如果 create 不为空，则进行 between 查询
+//                .orderByDesc(MuseummodelDO::getId)); // 按照 id 倒序
+//
+//    }
 
     //分页查询
 //    default PageResult<MuseummodelDO> selectPage(MuseummodelPageReqVO reqVO) {
@@ -55,7 +69,7 @@ public interface MuseummodelMapper extends BaseMapperX<MuseummodelDO> {
 //                .eqIfPresent(MuseummodelDO::getSpecimenNumber, reqVO.getSpecimenNumber()) // 如果 SpecimenNumber 不为空，则进行 = 查询
 //                .betweenIfPresent(MuseummodelDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime()) // 如果 create 不为空，则进行 between 查询
 //                .orderByDesc(MuseummodelDO::getId)); // 按照 id 倒序
-    }
+
 
     //联表查询
 //    default list<MuseummodelDetailDO> selectListByStatusAndDeptName(Integer status, String deptName) {