报价看板修改为分页查询

sd-business/src/main/java/com/sd/business/controller/bom/BomSpecController.java

@@ -14,8 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 
 /**
  * <p>
@@ -77,7 +75,7 @@ public class BomSpecController {
      * @return
      */
     @PostMapping("/getBomSpecQuotationList")
-    public List<BomSpecQuotationVo> getBomSpecQuotationList(@RequestBody BomSpecQuotationDto dto) {
+    public Page<BomSpecQuotationVo> getBomSpecQuotationList(@RequestBody BomSpecQuotationDto dto) {
         return bomSpecService.getBomSpecQuotationList(dto);
     }
 

sd-business/src/main/java/com/sd/business/entity/bom/dto/BomSpecQuotationDto.java

@@ -1,5 +1,6 @@
 package com.sd.business.entity.bom.dto;
 
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -13,7 +14,7 @@ import java.math.BigDecimal;
  */
 @Getter
 @Setter
-public class BomSpecQuotationDto {
+public class BomSpecQuotationDto extends BaseSelectDto {
 
     /**
      * bom品号

sd-business/src/main/java/com/sd/business/service/bom/BomSpecService.java

@@ -10,8 +10,6 @@ import com.sd.business.entity.bom.po.BomSpec;
 import com.sd.business.entity.bom.vo.BomSpecQuotationVo;
 import com.sd.business.entity.bom.vo.BomSpecVo;
 
-import java.util.List;
-
 
 /**
  * <p>
@@ -55,8 +53,9 @@ public interface BomSpecService extends BaseService<BomSpec> {
 
     /**
      * 获取bom报价数据列表
+     *
      * @param dto
      * @return
      */
-    List<BomSpecQuotationVo> getBomSpecQuotationList(BomSpecQuotationDto dto);
+    Page<BomSpecQuotationVo> getBomSpecQuotationList(BomSpecQuotationDto dto);
 }

sd-business/src/main/java/com/sd/business/service/bom/impl/BomSpecServiceImpl.java

@@ -1,7 +1,6 @@
 package com.sd.business.service.bom.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.domain.BaseIdPo;
@@ -124,9 +123,9 @@ public class BomSpecServiceImpl extends ServiceImpl<BomSpecMapper, BomSpec> impl
     }
 
     @Override
-    public List<BomSpecQuotationVo> getBomSpecQuotationList(BomSpecQuotationDto dto) {
+    public Page<BomSpecQuotationVo> getBomSpecQuotationList(BomSpecQuotationDto dto) {
 
-        List<BomSpecQuotationVo> list = Sql.create(BomSpecQuotationVo.class)
+        Page<BomSpecQuotationVo> page = Sql.create(BomSpecQuotationVo.class)
                 .selectAs(BomSpec::getCode, BomSpecQuotationVo::getBomSpecCode)
                 .selectAs(BomSpec::getLength, BomSpecQuotationVo::getLength)
                 .selectAs(BomSpec::getWidth, BomSpecQuotationVo::getWidth)
@@ -145,7 +144,13 @@ public class BomSpecServiceImpl extends ServiceImpl<BomSpecMapper, BomSpec> impl
                 .eq(BomSpec::getHeight, dto.getHeight())
                 .eq(Bom::getChromatophore, dto.getChromatophore())
                 .orderByDesc(BomSpec::getId)
-                .list();
+                .page(dto);
+
+        List<BomSpecQuotationVo> list = page.getRecords();
+
+        if (list.isEmpty()) {
+            return page;
+        }
 
         // 查询bom包材配置
         List<SkuDefaultPackageSpec> specList = skuDefaultPackageSpecService.list();
@@ -168,6 +173,7 @@ public class BomSpecServiceImpl extends ServiceImpl<BomSpecMapper, BomSpec> impl
                 })
                 .collect(Collectors.toMap(SkuDefaultPackageSpec::getSpec, Function.identity()));
 
+
         // 赋值包材价格
         for (BomSpecQuotationVo bomSpecQuotationVo : list) {
             bomSpecQuotationVo.setBomSpecUnitPriceLogo(new BigDecimal("0.5"));
@@ -222,7 +228,7 @@ public class BomSpecServiceImpl extends ServiceImpl<BomSpecMapper, BomSpec> impl
             bomSpecQuotationVo.setUnitPrice(unitPrice);
         }
 
-        return list;
+        return page;
     }
 
 }