Browse Source

添加了报价单的数据

wxf 2 years ago
parent
commit
d87a210175

+ 8 - 0
hx-sale/src/main/java/com/fjhx/sale/controller/quotation/QuotationPayController.java

@@ -25,4 +25,12 @@ public class QuotationPayController {
     @Autowired
     @Autowired
     private QuotationPayService quotationPayService;
     private QuotationPayService quotationPayService;
 
 
+    /**
+     * 报价 -收费项目表分页
+     */
+    @PostMapping("/page")
+    public Page<QuotationPayVo> page(@RequestBody QuotationPaySelectDto dto) {
+        return quotationPayService.getPage(dto);
+    }
+
 }
 }

+ 5 - 0
hx-sale/src/main/java/com/fjhx/sale/entity/quotation/dto/QuotationPaySelectDto.java

@@ -14,4 +14,9 @@ import lombok.Setter;
 @Setter
 @Setter
 public class QuotationPaySelectDto extends BaseSelectDto {
 public class QuotationPaySelectDto extends BaseSelectDto {
 
 
+    /**
+     * 收费项目
+
+     */
+    private String payName;
 }
 }

+ 2 - 1
hx-sale/src/main/java/com/fjhx/sale/mapper/quotation/QuotationPayMapper.java

@@ -1,5 +1,6 @@
 package com.fjhx.sale.mapper.quotation;
 package com.fjhx.sale.mapper.quotation;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fjhx.sale.entity.quotation.po.QuotationPay;
 import com.fjhx.sale.entity.quotation.po.QuotationPay;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -21,6 +22,6 @@ public interface QuotationPayMapper extends BaseMapper<QuotationPay> {
     /**
     /**
      * 报价 -收费项目表分页
      * 报价 -收费项目表分页
      */
      */
-    Page<QuotationPayVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<QuotationPay> wrapper);
+    Page<QuotationPayVo> getPage(@Param("page") Page<Object> page, @Param("ew") LambdaQueryWrapper<QuotationPay> wrapper);
 
 
 }
 }

+ 6 - 2
hx-sale/src/main/java/com/fjhx/sale/service/quotation/impl/QuotationPayServiceImpl.java

@@ -1,5 +1,8 @@
 package com.fjhx.sale.service.quotation.impl;
 package com.fjhx.sale.service.quotation.impl;
 
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.sale.entity.quotation.po.QuotationPay;
 import com.fjhx.sale.entity.quotation.po.QuotationPay;
 import com.fjhx.sale.mapper.quotation.QuotationPayMapper;
 import com.fjhx.sale.mapper.quotation.QuotationPayMapper;
 import com.fjhx.sale.service.quotation.QuotationPayService;
 import com.fjhx.sale.service.quotation.QuotationPayService;
@@ -26,8 +29,9 @@ public class QuotationPayServiceImpl extends ServiceImpl<QuotationPayMapper, Quo
 
 
     @Override
     @Override
     public Page<QuotationPayVo> getPage(QuotationPaySelectDto dto) {
     public Page<QuotationPayVo> getPage(QuotationPaySelectDto dto) {
-        IWrapper<QuotationPay> wrapper = getWrapper();
-        wrapper.orderByDesc("qp", QuotationPay::getId);
+        LambdaQueryWrapper<QuotationPay> wrapper = Wrappers.<QuotationPay>lambdaQuery();
+        wrapper.orderByDesc(QuotationPay::getCreateTime);
+        wrapper.like(ObjectUtil.isNotEmpty(dto.getPayName()),QuotationPay::getPayName,dto.getPayName());
         Page<QuotationPayVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         Page<QuotationPayVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;
         return page;
     }
     }