配件列表分页，查询参数修改

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java

@@ -124,7 +124,7 @@ public class PackController {
     @GetMapping("/getParts")
     @Operation(summary = "查看配件列表")
     @PreAuthorize("@ss.hasPermission('manage:pack-parts:query')")
-    public CommonResult<List<OrderPartsRespVO>> getParts(@Valid OrderPartsReqVO reqVO) {
+    public CommonResult<PageResult<OrderPartsRespVO>> getParts(@Valid OrderPartsReqVO reqVO) {
 
         return success(packService.getPartsList(reqVO));
 

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderPartsMapper.java

@@ -22,7 +22,7 @@ public interface OrderPartsMapper extends BaseMapperX<OrderPartsNDO> {
     IPage<PackageDetailsRespVO> selectParts(@Param("page") IPage page, @Param("packageId")  Long packageId, @Param("organId")  Long organId);
 
 
-    List<OrderPartsRespVO> selectPartsList( @Param("orderId") Long orderId , @Param("organId")  Long organId);
+    IPage<OrderPartsRespVO> selectPartsList(@Param("page") IPage page, @Param("orderId") Long orderId , @Param("organId")  Long organId);
 
 
 

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackService.java

@@ -35,7 +35,7 @@ public interface PackService {
 
 
     // 查看配件列表分页
-    List<OrderPartsRespVO> getPartsList(OrderPartsReqVO reqVO);
+    PageResult<OrderPartsRespVO> getPartsList(OrderPartsReqVO reqVO);
 
     OrderPackRespVO updateParts(OrderPartsReqVO reqVO);
 

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java

@@ -170,15 +170,17 @@ public class PackServiceImpl implements PackService {
 
     // 查看配件列表分页
     @Override
-    public List<OrderPartsRespVO> getPartsList(OrderPartsReqVO reqVO) {
+    public PageResult<OrderPartsRespVO> getPartsList(OrderPartsReqVO reqVO) {
 
-//        PageDTO<OrderPartsRespVO> page = new PageDTO<>(reqVO.getPageNo(), reqVO.getPageSize());
+        PageDTO<OrderPartsRespVO> page = new PageDTO<>(reqVO.getPageNo(), reqVO.getPageSize());
 
-        List<OrderPartsRespVO> orderPartsRespVOS = orderPartsMapper.selectPartsList(reqVO.getOrderId(),getUserOrganId());
+        IPage<OrderPartsRespVO> orderPartsRespVOS = orderPartsMapper.selectPartsList(page,reqVO.getOrderId(),getUserOrganId());
 
+        if (CollectionUtil.isEmpty(orderPartsRespVOS.getRecords())) {
+            return new PageResult<>();
+        }
 
-        return orderPartsRespVOS;
-
+        return new PageResult<>(orderPartsRespVOS.getRecords(), orderPartsRespVOS.getTotal());
 
     }
 

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderPartsMapper.xml

@@ -72,7 +72,7 @@
 
 
         select distinct
-            op.id as partsId,op.name,op.model,op.spec,oi.num as num,op.unit,op.brand,op.factory,op.remark
+            op.id as partsId,op.name,op.model,op.spec,oi.num as num,op.unit,op.brand,op.factory,op.remark,op.type
         from order_parts op
                  join order_item oi on op.id = oi.parts_id and op.organ_id = oi.organ_id