Merge branch 'master' of http://gogs.gisvg.com/lsq/museum-java

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

@@ -50,7 +50,7 @@ public class MuseumFlowController {
         return CommonResult.success(result1);
     }
 
-    @PostMapping("/Outbound")
+    @PostMapping("/outbound")
     @Operation(summary = "添加出库单")
     public CommonResult<Boolean>  createMuseumFlowOutbound(@RequestBody MuseumFlowSaveVO saveVO){
         String sample_id=saveVO.getNumber();
@@ -71,10 +71,10 @@ public class MuseumFlowController {
         }
     }
 
-    @GetMapping("/page")
-    @Operation(summary = "获取分页")
-    public PageResult<MuseumFlowDO> selectPageS(@Valid MuseumFlowPageVO pageVO){
-        return  museumFlowService.selectPageS(pageVO);
+    @GetMapping("/pagePerson")
+    @Operation(summary = "获取关于出库员的分页")
+    public PageResult<MuseumFlowDO> selectMuseumFlowOutboundPerson(@Valid MuseumFlowPageVO pageVO){
+        return  museumFlowService.selectPageMuseumFlowOutboundPerson(pageVO);
     }
 
     @PostMapping("/review")

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

@@ -46,7 +46,7 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
 
 //   default MuseumFlowDO selectPageMuseumFlowByPage(String number){return selectOne(MuseumFlowDO::getNumber,number);}
 /**分页**/
-   default PageResult<MuseumFlowDO> selectPage1(MuseumFlowPageVO pageVO){
+   default PageResult<MuseumFlowDO> selectPageS(MuseumFlowPageVO pageVO){
        LambdaQueryWrapperX<MuseumFlowDO> queryWrapper = new LambdaQueryWrapperX<>();
        queryWrapper .likeIfPresent(MuseumFlowDO::getNumber,pageVO.getNumber())
                .betweenIfPresent(MuseumFlowDO::getOutboundTime, pageVO.getOutboundTime())
@@ -61,16 +61,22 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
 //               .eqIfPresent(MuseumFlowDO::getOutboundPerson,pageVO.getOutboundPerson())
 //               .inIfPresent(MuseumFlowDO::getId, id)
 //               .orderByDesc(MuseumFlowDO::getId));
+//        in 来指定多个值，如 in(w1,2,3);
+//        between..and 来指定遥感连续的范围， 如 between 1 and 10；
+//        like 是模糊查询;
+//        order by 按照某个字段进行排序 ;加上 desc 表示降序排序(默认为升序 asc);
+//
+
    }
     /**根据出库员进行分页查找*/
-    default List<MuseumFlowDO> selectPageMuseumFlowByOutboundPerson(MuseumFlowPageVO pageVO) {
+    default PageResult<MuseumFlowDO> selectPageMuseumFlowByOutboundPerson(MuseumFlowPageVO pageVO) {
 
        LambdaQueryWrapperX<MuseumFlowDO> queryWrapper = new LambdaQueryWrapperX<>();
         queryWrapper .likeIfPresent(MuseumFlowDO::getNumber,pageVO.getNumber())
                 .betweenIfPresent(MuseumFlowDO::getOutboundTime, pageVO.getOutboundTime())
                 .eqIfPresent(MuseumFlowDO::getOutboundPerson,pageVO.getOutboundPerson())
                 .orderByDesc(MuseumFlowDO::getId);
-        return selectList(queryWrapper);
+        return selectPage(pageVO, queryWrapper);
     }
 
 /**审批功能

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

@@ -8,8 +8,6 @@ import cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo.MuseumFlowS
 import cn.iocoder.yudao.module.museum.dal.database.museumflow.MuseumFlowDO;
 import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
 
-import java.util.List;
-
 public interface MuseumFlowService {
     /**
      * 创建标本
@@ -57,7 +55,7 @@ public interface MuseumFlowService {
     PageResult<MuseumFlowDO> selectPageS(MuseumFlowPageVO pageVO);
 
     /**根据出库员进行分页查找*/
-    List<MuseumFlowDO> selectPageMuseumFlowOutboundPerson(MuseumFlowPageVO pageVO);
+    PageResult<MuseumFlowDO> selectPageMuseumFlowOutboundPerson(MuseumFlowPageVO pageVO);
 
 
 /**审批功能

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

@@ -12,7 +12,6 @@ import cn.iocoder.yudao.module.museum.dal.mysql.museumflow.MuseumFlowMapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 @Service
 public class MuseumFlowServiceImpl implements MuseumFlowService {
@@ -72,7 +71,7 @@ public class MuseumFlowServiceImpl implements MuseumFlowService {
 
     /**根据出库员进行分页查找*/
     @Override
-    public List<MuseumFlowDO> selectPageMuseumFlowOutboundPerson(MuseumFlowPageVO pageVO){
+    public PageResult<MuseumFlowDO> selectPageMuseumFlowOutboundPerson(MuseumFlowPageVO pageVO){
         return museumFlowMapper.selectPageMuseumFlowByOutboundPerson(pageVO);
     }
 
@@ -82,7 +81,7 @@ public class MuseumFlowServiceImpl implements MuseumFlowService {
     /**根据分页长度进行排序**/
     @Override
     public PageResult<MuseumFlowDO> selectPageS(MuseumFlowPageVO pageVO){
-        return  museumFlowMapper.selectPage1(pageVO);
+        return  museumFlowMapper.selectPageS(pageVO);
     }