新增分页查询未完成

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/database/museummodel/MuseummodelDO.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.museum.dal.database.museummodel;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -43,4 +45,7 @@ public class MuseummodelDO extends BaseDO {
     @Schema(description = "备注")
     private String remark;
 
+    @TableField(exist = false)
+    private MuseumInfoDO museumInfo;
+
 }

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

@@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.museum.controller.admin.museummodel.vo.MuseummodelPageReqVO;
+import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
 import cn.iocoder.yudao.module.museum.dal.database.museummodel.MuseummodelDO;
 import cn.iocoder.yudao.module.museum.dal.database.museummodel.MuseummodelDetailDO;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -25,6 +26,25 @@ public interface MuseummodelMapper extends BaseMapperX<MuseummodelDO> {
     @Select("SELECT * FROM museum_model WHERE id = #{id} AND deleted =0 ")
     MuseummodelDO selectMuseumModelById(@Param("id") Integer id);
 
+    //分页查询
+    default PageResult<MuseummodelDO> selectPage(MuseummodelPageReqVO reqVO) {
+        MPJLambdaWrapper<MuseummodelDO>mpjLambdaWrapper = new MPJLambdaWrapper<>();
+        mpjLambdaWrapper.leftJoin(MuseumInfoDO.class,MuseumInfoDO::getSampleId,MuseummodelDO::getSpecimenNumber)
+                .selectAll(MuseummodelDO.class)// 查询 List
+                .selectAssociation(MuseummodelDO.class,MuseummodelDO::getMuseumInfo);
+
+                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.getBeginCreateTime(), reqVO.getEndCreateTime()) // 如果 create 不为空，则进行 between 查询
+                .orderByDesc(MuseummodelDO::getId)); // 按照 id 倒序
+
+    }
+
     //分页查询
 //    default PageResult<MuseummodelDO> selectPage(MuseummodelPageReqVO reqVO) {
 //        return selectPage(reqVO, new LambdaQueryWrapperX<MuseummodelDO>()