1 anno fa
parent
commit
29b7afb286

+ 1 - 1
platform-service/src/main/java/com/platform/service/store/InStoreFormService.java

@@ -31,7 +31,7 @@ import java.util.List;
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface InStoreFormService extends IBaseService<InStoreForm, InStoreFormDTO> {
-    AbstractPageResultBean<InStoreFormVO> getInStoreFormCollect(InStoreFormDTO dto,Integer pageSize,Integer pageNum);
+    AbstractPageResultBean<InStoreFormVO> getInStoreFormCollect(InStoreFormDTO dto,Integer pageNum,Integer pageSize);
 
     List<ExportInStoreSpareNumVO> getInStoreSpareNum(InStoreFormDTO dto,Integer year,Integer month);
 

+ 1 - 1
platform-service/src/main/java/com/platform/service/store/OutStoreFormService.java

@@ -27,7 +27,7 @@ import java.util.List;
  */
 public interface OutStoreFormService extends IBaseService<OutStoreForm, OutStoreFormDTO> {
 
-    AbstractPageResultBean<OutStoreFormVO> getOutStoreFormCollect(OutStoreFormDTO dto,Integer pageSize,Integer pageNum);
+    AbstractPageResultBean<OutStoreFormVO> getOutStoreFormCollect(OutStoreFormDTO dto,Integer pageNum,Integer pageSize);
 
     List<ExportOutStoreSpareNumVO> getOutStoreSpareNum(OutStoreFormDTO dto, Integer year, Integer month);
 

+ 3 - 2
platform-service/src/main/java/com/platform/service/store/impl/InStoreFormServiceImpl.java

@@ -238,9 +238,10 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
 
 
     @Override
-    public AbstractPageResultBean<InStoreFormVO> getInStoreFormCollect(InStoreFormDTO dto, Integer pageSize, Integer pageNum) {
+    public AbstractPageResultBean<InStoreFormVO> getInStoreFormCollect(InStoreFormDTO dto, Integer pageNum,Integer pageSize) {
         PageHelper.startPage(pageNum,pageSize);
-        return new MyPage<>(mapper.getInStoreFormCollect(dto));
+        List<InStoreFormVO> list = mapper.getInStoreFormCollect(dto);
+        return new MyPage<>(list);
     }
 
     @Override

+ 1 - 1
platform-service/src/main/java/com/platform/service/store/impl/OutStoreFormServiceImpl.java

@@ -62,7 +62,7 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
 
 
     @Override
-    public AbstractPageResultBean<OutStoreFormVO> getOutStoreFormCollect(OutStoreFormDTO dto, Integer pageSize, Integer pageNum) {
+    public AbstractPageResultBean<OutStoreFormVO> getOutStoreFormCollect(OutStoreFormDTO dto, Integer pageNum,Integer pageSize) {
         PageHelper.startPage(pageNum,pageSize);
         return new MyPage(mapper.getOutStoreFormCollect(dto));
     }