Browse Source

回库程序

BigLawn 3 months ago
parent
commit
d557f3d3c5

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

@@ -81,8 +81,8 @@ public class MuseumFlowController {
     }
 
     @GetMapping("/page")
-    @Operation(summary = "根据所给参数获取标本在库中的信息")
-    public CommonResult<PageResult<MuseumFlowDO>> selectPageMuseumFlowFormIntel(@Valid MuseumFlowPageVO pageVO) {
+    @Operation(summary = "根据所给参数获取标本在出回库中的信息")
+    public CommonResult<PageResult<MuseumFlowInfoVO>> selectPageMuseumFlowFormIntel(@Valid MuseumFlowPageVO pageVO) {
         return CommonResult.success(museumFlowService.selectPageMuseumFlowFormIntel(pageVO));
     }
 

+ 1 - 1
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<MuseumFlowDO> selectPageMuseumFlowFormIntel(MuseumFlowPageVO pageVO);
+    PageResult<MuseumFlowInfoVO> selectPageMuseumFlowFormIntel(MuseumFlowPageVO pageVO);
 
 
 /**审批功能

+ 3 - 3
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<MuseumFlowDO> selectPageMuseumFlowFormIntel(MuseumFlowPageVO pageVO){
-//        PageResult<MuseumFlowInfoVO> result = BeanUtils.toBean(museumFlowMapper.selectPageMuseumFlowFormIntel(pageVO),MuseumFlowInfoVO.class);
-        return museumFlowMapper.selectPageMuseumFlowFormIntel(pageVO);
+    public PageResult<MuseumFlowInfoVO> selectPageMuseumFlowFormIntel(MuseumFlowPageVO pageVO){
+        PageResult<MuseumFlowInfoVO> result = BeanUtils.toBean(museumFlowMapper.selectPageMuseumFlowFormIntel(pageVO),MuseumFlowInfoVO.class);
+        return result;
     }