Merge remote-tracking branch 'origin/master'

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museummodel/MuseummodelController.java

@@ -34,10 +34,6 @@ public class MuseummodelController {
     @PostMapping("/create")
     @Operation(summary = "新增模型")
     public Integer createMuseumModel(@RequestBody MuseummodelSaveVO saveVO) {
-
-        if (saveVO == null) {
-            return -1;
-        }
         return museumModelService.createMuseumModel(saveVO);
     }
 
@@ -76,13 +72,13 @@ public class MuseummodelController {
 //    }
 
 
-//@GetMapping("/page")
-//@Operation(summary = "获得模型分页")
-//@PreAuthorize("@ss.hasPermission('system:tenant:query')")
-//public CommonResult<PageResult<MuseummodelRespVO>> getPage(@Valid MuseummodelPageReqVO pageVO) {
-//    PageResult<MuseummodelDO> pageResult = museumModelService.getMuseummodelPage(pageVO);
-//    return success(BeanUtils.toBean(pageResult,MuseummodelRespVO.class));
-//}
+@GetMapping("/page")
+@Operation(summary = "获得模型分页")
+@PreAuthorize("@ss.hasPermission('system:tenant:query')")
+public CommonResult<PageResult<MuseummodelRespVO>> getPage(@Valid MuseummodelPageReqVO pageVO) {
+    PageResult<MuseummodelDO> pageResult = museumModelService.getMuseumModelPage(pageVO);
+    return success(BeanUtils.toBean(pageResult,MuseummodelRespVO.class));
+}
 
 }
 

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museummodel/vo/MuseummodelPageReqVO.java

@@ -18,11 +18,10 @@ public class MuseummodelPageReqVO extends PageParam {
     private Integer id;
 
     @Schema(description = "模型名称")
-    private String specimenName;
+    private String modelName;
 
     @Schema(description = "模型编号")
     private Integer specimenNumber;
-
     //额外添加
     @Schema(description = "模型类型")
     private String specimenType;

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museummodel/vo/MuseummodelRespVO.java

@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.museum.controller.admin.museummodel.vo;
 
+import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -18,6 +20,9 @@ public class MuseummodelRespVO {
      @Schema(description = "模型编号")
     private Integer specimenNumber;
 
+    @Schema(description = "模型类型")
+    private String specimenType;
+
     @Schema(description = "模型图片")
     private String modelPhoto;
 
@@ -27,6 +32,8 @@ public class MuseummodelRespVO {
     @Schema(description = "备注")
     private String remark;
 
+    private MuseumInfoDO museumInfo;
+
 
 
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museummodel/vo/MuseummodelSaveVO.java

@@ -13,11 +13,14 @@ public class MuseummodelSaveVO {
     private Integer id;
 
     @Schema(description = "模型名称")
-    private String specimenName;
+    private String modelName;
     //
     @Schema(description = "模型编号")
     private String specimenNumber;
     //
+    @Schema(description = "模型类型")
+    private String specimenType;
+    //
     @Schema(description = "模型图片")
     private String modelPhoto;
     //

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

@@ -28,9 +28,9 @@ public class MuseummodelDO extends BaseDO {
     private Integer id;
 
     @Schema(description = "模型名称")
-    private String specimenName;
+    private String modelName;
 
-    @Schema(description = "标本编号")
+    @Schema(description = "模型编号")
     private String specimenNumber;
 
     @Schema(description = "模型类型")
@@ -45,8 +45,7 @@ public class MuseummodelDO extends BaseDO {
     @Schema(description = "备注")
     private String remark;
 
-    @TableField(exist = false) //
-    @Schema(description = "标本信息")
-    private MuseumInfoDO  museumInfoDO;
+    @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

@@ -27,13 +27,39 @@ public interface MuseummodelMapper extends BaseMapperX<MuseummodelDO> {
     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)
-////                .selectAssociation(MuseumInfoDO.class,MuseummodelDO::getMuseumInfoDO)
-////                .
+    default PageResult<MuseummodelDO> getMuseumModelPage(MuseummodelPageReqVO reqVO) {
+        MPJLambdaWrapper<MuseummodelDO> mpjLambdaWrapper = new MPJLambdaWrapper<>();
+        mpjLambdaWrapper.leftJoin(MuseumInfoDO.class, MuseumInfoDO::getSampleId, MuseummodelDO::getSpecimenNumber)
+                .selectAll(MuseummodelDO.class)// 查询 List
+                .selectAssociation(MuseummodelDO.class, MuseummodelDO::getMuseumInfo);
+
+        mpjLambdaWrapper
+                .likeIfExists(MuseummodelDO::getModelName, reqVO.getModelName())// 如果 SpecimenName 不为空，则进行 like 查询
+                .likeIfExists(MuseummodelDO::getSpecimenType, reqVO.getSpecimenType())
+                .likeIfExists(MuseummodelDO::getModelWay, reqVO.getModelWay())
+                .likeIfExists(MuseummodelDO::getRemark, reqVO.getRemark())
+                .eqIfExists(MuseummodelDO::getSpecimenNumber, reqVO.getSpecimenNumber()) // 如果 SpecimenNumber 不为空，则进行 = 查询
+//                .between(MuseummodelDO::getCreateTime, reqVO.get, 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) {
 //        return selectPage(reqVO, new LambdaQueryWrapperX<MuseummodelDO>()
 //                .likeIfPresent(MuseummodelDO::getSpecimenName, reqVO.getSpecimenName())// 如果 SpecimenName 不为空，则进行 like 查询
 //                .likeIfPresent(MuseummodelDO::getSpecimenType, reqVO.getSpecimenType())
@@ -42,7 +68,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) {
@@ -60,7 +86,6 @@ public interface MuseummodelMapper extends BaseMapperX<MuseummodelDO> {
 
 //    }
 //}
-}
 
 
 

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museummodel/MuseummodelService.java

@@ -36,7 +36,7 @@ public interface MuseummodelService {
     * @param pageReqVO 分页查询
     * @return 分页
     */
-//   PageResult<MuseummodelDO> getMuseummodelPage(MuseummodelPageReqVO pageReqVO);
+   PageResult<MuseummodelDO> getMuseumModelPage(MuseummodelPageReqVO pageReqVO);
 
 
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museummodel/MuseummodelServiceImpl.java

@@ -41,10 +41,10 @@ public  class MuseummodelServiceImpl implements MuseummodelService {
       return museumModelMapper.selectMuseumModelById(id);
    }
 
-//   @Override
-//   public PageResult<MuseummodelDO> getMuseummodelPage(MuseummodelPageReqVO pageReqVO) {
-//      return museumModelMapper.selectPage(pageReqVO);
-//   }
+   @Override
+   public PageResult<MuseummodelDO> getMuseumModelPage(MuseummodelPageReqVO pageReqVO) {
+      return museumModelMapper.getMuseumModelPage(pageReqVO);
+   }
 
 //     @Override
 //      public  PageResult<MuseummodelDO> getPage (MuseummodelPageReqVO pageReqVO){