优化

platform-rest/src/main/java/com/platform/rest/controller/sqarepartmanage/SparePartInfoController.java

@@ -180,7 +180,7 @@ public class SparePartInfoController {
      * @return R
      */
     @GetMapping("/page")
-    public R<SparePartInfo> query(SparePartInfoDTO sparePartInfoDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+    public R<AbstractPageResultBean<SparePartInfoVO>> query(SparePartInfoDTO sparePartInfoDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
         return new R(sparePartInfoService.selectPageInfo2(sparePartInfoDTO, pageNum, pageSize));
     }
 

platform-service/src/main/java/com/platform/service/sqarepartmanage/SparePartInfoService.java

@@ -21,7 +21,7 @@ import java.util.List;
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface SparePartInfoService extends IBaseService<SparePartInfo, SparePartInfoDTO> {
- List<SparePartInfoVO> selectPageInfo2(SparePartInfoDTO record, int pageNum, int pageSize);
+ AbstractPageResultBean<SparePartInfoVO> selectPageInfo2(SparePartInfoDTO record, int pageNum, int pageSize);
 
 
 

platform-service/src/main/java/com/platform/service/sqarepartmanage/impl/SparePartInfoServiceImpl.java

@@ -387,7 +387,7 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
     }
 
     @Override
-    public List<SparePartInfoVO> selectPageInfo2(SparePartInfoDTO record, int pageNum, int pageSize) {
+    public AbstractPageResultBean<SparePartInfoVO> selectPageInfo2(SparePartInfoDTO record, int pageNum, int pageSize) {
 
         if(StringUtils.isNotEmpty(record.getModel())){
             SbModelSpareBomDTO sbModelDTO = new SbModelSpareBomDTO();
@@ -400,11 +400,11 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
         // 选择设备对应的备件bom列表
         if (record.getSbId() != null) {
             SbInfoVO sbInfo = sbInfoMapper.getById(record.getSbId());
-//            List<SparePartInfoVO> partList = mapper.selectSpareInfoList(sbInfo.getModelId());
-            PageHelper.startPage(pageNum, pageSize);
             List<SparePartInfoVO> partList = mapper.selectSpareInfoList(sbInfo.getModelId());
-//            AbstractPageResultBean<SparePartInfo> pageInfo = new MyPage(partList);
-            return partList;
+            PageHelper.startPage(pageNum, pageSize);
+//            List<SparePartInfoVO> partList = mapper.selectSpareInfoList(sbInfo.getModelId());
+            AbstractPageResultBean<SparePartInfoVO> pageInfo = new MyPage(partList);
+            return pageInfo;
         } else {
             List<SpareType> typeList = spareTypeMapper.selectAll();
             if (StringUtils.isNotBlank(record.getTypeName())) {
@@ -452,8 +452,8 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
                     }
                 }
             }
-//            AbstractPageResultBean<SparePartInfo> pageInfo = new MyPage(list);
-            return list;
+            AbstractPageResultBean<SparePartInfoVO> pageInfo = new MyPage(list);
+            return pageInfo;
         }
     }