1 year ago
parent
commit
56515ea61b

+ 1 - 1
platform-service/src/main/java/com/platform/service/util/PageUtils.java

@@ -25,7 +25,7 @@ import java.util.*;
 @Slf4j
 @UtilityClass
 public class PageUtils {
-    private static AbstractPageResultBean<T> getPageInfo(Integer pageNum, Integer pageSize, List<T> list){
+    public static <T> AbstractPageResultBean<T> getPageInfo(Integer pageNum, Integer pageSize, List<T> list){
         AbstractPageResultBean<T> pageInfo = new MyPage(list);
         pageInfo.setPageNum(pageNum);
         pageInfo.setPageSize(pageSize);

+ 4 - 22
platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -42,6 +42,7 @@ import com.platform.dao.vo.sb.SbInfoVO;
 import com.platform.dao.vo.sb.SbModelSpareBomVO;
 import com.platform.service.store.OutStoreDetailService;
 import com.platform.service.store.OutStoreFormService;
+import com.platform.service.util.PageUtils;
 import com.platform.service.yongyou.YongyouService;
 import handler.yongyou.*;
 import handler.yongyou.request.*;
@@ -528,13 +529,15 @@ public class YongyouServiceImpl implements YongyouService {
                     longYanPurchaseDetailMapper.updateBatchPurchaseDetails(list);
                 }
             }
-            AbstractPageResultBean<LongYanPurchaseDetailListVO> voMyPage = getPageInfo(pageNum,pageSize,data);
+            AbstractPageResultBean<LongYanPurchaseDetailListVO> voMyPage = PageUtils.getPageInfo(pageNum,pageSize,data);
             return voMyPage;
         }
 
         return null;
     }
 
+
+
     private void addDetailStatus(List<LongYanPurchaseDetailListVO> data, LongYanPurchaseDetailDTO detail) {
         if ("已请购".equals(data.get(0).getCAppState())){
             detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.applyed.getValue());
@@ -573,27 +576,6 @@ public class YongyouServiceImpl implements YongyouService {
         }
     }
 
-    private static AbstractPageResultBean<LongYanPurchaseDetailListVO> getPageInfo(Integer pageNum, Integer pageSize, List<LongYanPurchaseDetailListVO> list){
-        AbstractPageResultBean<LongYanPurchaseDetailListVO> pageInfo = new MyPage(list);
-        pageInfo.setPageNum(pageNum);
-        pageInfo.setPageSize(pageSize);
-        List<LongYanPurchaseDetailListVO> dataList = new ArrayList<>();
-        for (int i = pageSize*(pageNum-1);i<pageSize*pageNum;i++){
-            if (i<list.size()) {
-                dataList.add(list.get(i));
-            }
-        }
-        pageInfo.setRows(dataList);
-        if (list!=null&&list.size()>0){
-            int pages = list.size()%pageSize==0?list.size()/pageSize:(list.size()/pageSize)+1;
-            pageInfo.setPages(pages);
-        }else {
-            pageInfo.setPages(0);
-        }
-        pageInfo.setTotal((long)list.size());
-        return pageInfo;
-    }
-
     @Override
     public String deletePurchaseOrder(String id) {