Merge remote-tracking branch 'origin/master'

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museuminfo/MuseumInfoController.java

@@ -108,9 +108,9 @@ public class MuseumInfoController {
 
     @GetMapping("/page")
     @Operation(summary = "获取分页")
-    public CommonResult<PageResult<MuseumInfoPageReqVO>> getPage(@Valid MuseumInfoPageReqVO pageReqVO){
+    public PageResult<MuseumInfoRespVO> getPage(@Valid MuseumInfoPageReqVO pageReqVO){
         PageResult<MuseumInfoDO> PageResult = museumInfoService.getMuseumInfoPage(pageReqVO);
-        return success(BeanUtils.toBean(PageResult, MuseumInfoPageReqVO.class));
+        return BeanUtils.toBean(PageResult, MuseumInfoRespVO.class);
     }
 
 

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museuminfo/vo/MuseumInfoPageReqVO.java

@@ -6,6 +6,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import java.time.LocalDateTime;
+
 @Schema(description = "博物馆-标本信息-分页 pageReq VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -23,6 +25,65 @@ public class MuseumInfoPageReqVO extends PageParam {
 
     @Schema(description = "存放位置")
     private String place;
-    
+
+    @Schema(description = "中文名称")
+    private String chineseName;
+
+    @Schema(description = "英文名称")
+    private String englishName;
+
+    @Schema(description = "国际名称")
+    private String internationName;
+
+    @Schema(description = "保存类型")
+    private Integer keepType;
+
+    @Schema(description = "成份")
+    private String element;
+
+    @Schema(description = "产地")
+    private String  local;
+
+    @Schema(description = "时代")
+    private LocalDateTime bronTime ;
+
+    @Schema(description = "保存地层")
+    private String stratum;
+
+    @Schema(description = "发现时间")
+    private LocalDateTime findTime;
+
+    @Schema(description = "尺寸")
+    private String size;
+
+    @Schema(description = "重量")
+    private Long weight;
+
+    @Schema(description = "来源")
+    private String origin;
+
+    @Schema(description = "描述")
+    private String bewrite;
+
+    @Schema(description = "馆藏状态")
+    private Integer store;
+
+    @Schema(description = "入库时间")
+    private LocalDateTime storeTime;
+
+    @Schema(description = "用途")
+    private String way;
+
+    @Schema(description = "资产号")
+    private String fundId;
+
+    @Schema(description = "删除原因")
+    private String reason;
+
+    @Schema(description = "标本图片")
+    private String picture;
+
+    @Schema(description = "备注")
+    private String sampleTip;
 }
 

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/mysql/museuminfo/MuseumInfoMapper.java

@@ -140,7 +140,11 @@ public interface MuseumInfoMapper extends BaseMapperX<MuseumInfoDO> {
 
     /**
      * 分页
-     */
+     *         in 来指定多个值，如 in(w1,2,3);
+     *        between..and 来指定遥感连续的范围， 如 between 1 and 10；
+     *         like 是模糊查询;
+     *        order by 按照某个字段进行排序 ;加上 desc 表示降序排序(默认为升序 asc);
+     *     /**根据输入信息进行分页查找*/
     default PageResult<MuseumInfoDO> selectPage(MuseumInfoPageReqVO pageReqVO) {
         return selectPage(pageReqVO, new LambdaQueryWrapperX<MuseumInfoDO>()
                 .likeIfPresent(MuseumInfoDO::getSampleId, pageReqVO.getSampleId())
@@ -148,7 +152,9 @@ public interface MuseumInfoMapper extends BaseMapperX<MuseumInfoDO> {
                 .likeIfPresent(MuseumInfoDO::getPlace, pageReqVO.getPlace())
                 .orderByDesc(MuseumInfoDO::getId));
     }
-
+    /**
+     * 分页(List)
+     */
     default List<MuseumInfoDO> selectPageList(MuseumInfoPageReqVO pageReqVO) {
         LambdaQueryWrapperX<MuseumInfoDO> queryWrapper = new LambdaQueryWrapperX<>();
         queryWrapper.inIfPresent(MuseumInfoDO::getSampleId,pageReqVO.getSampleId())

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museuminfo/MuseumInfoService.java

@@ -61,8 +61,8 @@ public interface MuseumInfoService {
     */
     PageResult<MuseumInfoDO> getMuseumInfoPage(MuseumInfoPageReqVO pageReqVO);
    /**
-    * 查询标本类型
-    * */
+    * 分页(List)
+    */
    List<MuseumInfoDO> getMuseumInfoPageList(MuseumInfoPageReqVO pageReqVO);
    /**
     * 标本类型计数

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museuminfo/MuseumInfoServiceImpl.java

@@ -136,8 +136,8 @@ public  class  MuseumInfoServiceImpl implements MuseumInfoService {
       return museumInfoMapper.selectPage(pageReqVO);
    }
    /**
-    * 查询标本类型
-    * */
+    * 分页(List)
+    */
    @Override
    public List<MuseumInfoDO> getMuseumInfoPageList(MuseumInfoPageReqVO pageReqVO){
       return museumInfoMapper.selectPageList(pageReqVO);