回库程序

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumflow/MuseumFlowController.java

@@ -74,23 +74,17 @@ public class MuseumFlowController {
         return CommonResult.success(result1);
     }
 
-//    @GetMapping("/selectPage")
-//    @Operation(summary = "获取关于标本信息的分页")
-//    public PageResult<MuseumInfoDO> selectPage(@Valid MuseumInfoPageReqVO pageVO) {
-//        return museumInfoService.getMuseumInfoPage(pageVO);
-//    }
+    @GetMapping("/selectPage")
+    @Operation(summary = "获取关于标本信息的分页")
+    public PageResult<MuseumInfoDO> selectPage(@Valid MuseumInfoPageReqVO pageVO) {
+        return museumInfoService.getMuseumInfoPage(pageVO);
+    }
 
-//    @GetMapping("/page")
-//    @Operation(summary = "根据所给参数获取标本在总库中的信息")
-//    public CommonResult<PageResult<MuseumInfoDO>> selectPageMuseumFlowFormIntel(@Valid MuseumFlowPageVO pageVO) {
-//        PageResult<MuseumInfoDO> event = new PageResult<>();
-//        for (String number :pageVO.getNumber()){
-//            MuseumInfoPageReqVO reqVO = new MuseumInfoPageReqVO();
-//            reqVO.setSampleId(number);
-//            PageResult<MuseumInfoDO> result = museumInfoService.getMuseumInfoPage(reqVO);
-//        }
-//        return CommonResult.success();
-//    }
+    @GetMapping("/page")
+    @Operation(summary = "根据所给参数获取标本在总库中的信息")
+    public CommonResult<PageResult<MuseumFlowDO>> selectPageMuseumFlowFormIntel(@Valid MuseumFlowPageVO pageVO) {
+        return CommonResult.success(museumFlowService.selectPageMuseumFlowFormIntel(pageVO));
+    }
 
     @GetMapping("/getFormIntel")
     @Operation(summary = "根据id查找标本出回库中的信息，并展示在总库中的信息")

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumflow/vo/MuseumFlowPageVO.java

@@ -46,7 +46,7 @@ public class MuseumFlowPageVO extends PageParam {
     private String applyUnit;
 
     @Schema(description = "申请时间")
-    private LocalDateTime applyTime;
+    private LocalDateTime[] applyTime;
 
     @Schema(description = "预计退还时间")
     private String returnExpect;

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/mysql/museumflow/MuseumFlowMapper.java

@@ -75,8 +75,9 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
     default PageResult<MuseumFlowDO> selectPageMuseumFlowFormIntel(MuseumFlowPageVO pageVO) {
        LambdaQueryWrapperX<MuseumFlowDO> queryWrapper = new LambdaQueryWrapperX<>();
         queryWrapper.inIfPresent(MuseumFlowDO::getNumber,pageVO.getNumber())
-                .betweenIfPresent(MuseumFlowDO::getOutboundTime, pageVO.getOutboundTime())
+                .betweenIfPresent(MuseumFlowDO::getApplyTime, pageVO.getApplyTime())
                 .eqIfPresent(MuseumFlowDO::getOutboundPerson,pageVO.getOutboundPerson())
+                .inIfPresent(MuseumFlowDO::getState,pageVO.getState())
                 .orderByDesc(MuseumFlowDO::getId);
         return selectPage(pageVO, queryWrapper);
     }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museumflow/MuseumFlowService.java

@@ -75,7 +75,7 @@ public interface MuseumFlowService {
 //    PageResult<MuseumFlowDO> selectPageS(MuseumFlowPageVO pageVO);
 
     /**根据输入信息进行分页查找*/
-    PageResult<MuseumFlowInfoVO> selectPageMuseumFlowFormIntel(MuseumFlowPageVO pageVO);
+    PageResult<MuseumFlowDO> selectPageMuseumFlowFormIntel(MuseumFlowPageVO pageVO);
 
 
 /**审批功能

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museumflow/MuseumFlowServiceImpl.java

@@ -214,9 +214,9 @@ public class MuseumFlowServiceImpl implements MuseumFlowService {
 
     /**根据输入信息进行分页查找*/
     @Override
-    public PageResult<MuseumFlowInfoVO> selectPageMuseumFlowFormIntel(MuseumFlowPageVO pageVO){
-        PageResult<MuseumFlowInfoVO> result = BeanUtils.toBean(museumFlowMapper.selectPageMuseumFlowFormIntel(pageVO),MuseumFlowInfoVO.class);
-        return result;
+    public PageResult<MuseumFlowDO> selectPageMuseumFlowFormIntel(MuseumFlowPageVO pageVO){
+//        PageResult<MuseumFlowInfoVO> result = BeanUtils.toBean(museumFlowMapper.selectPageMuseumFlowFormIntel(pageVO),MuseumFlowInfoVO.class);
+        return museumFlowMapper.selectPageMuseumFlowFormIntel(pageVO);
     }