Browse Source

已到账金额:展示认领记录

caozj 2 years ago
parent
commit
9c6f088ff7

+ 11 - 0
hx-sale/src/main/java/com/fjhx/sale/controller/claim/ClaimContractController.java

@@ -1,5 +1,6 @@
 package com.fjhx.sale.controller.claim;
 
+import com.fjhx.sale.entity.claim.po.ClaimContract;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.claim.vo.ClaimContractVo;
@@ -9,6 +10,8 @@ import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.fjhx.sale.service.claim.ClaimContractService;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -34,6 +37,14 @@ public class ClaimContractController {
     }
 
     /**
+     * 根据合同批量查询
+     */
+    @PostMapping("/getListByContractIds")
+    public List<ClaimContract> getListByContractIds(@RequestBody List<Long> contractIds) {
+        return claimContractService.getListByContractIds(contractIds);
+    }
+
+    /**
      * 到账认领-合同关联表明细
      */
     @PostMapping("/detail")

+ 5 - 1
hx-sale/src/main/java/com/fjhx/sale/service/sale/impl/SaleQuotationServiceImpl.java

@@ -102,8 +102,12 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
 
         // 赋值用户名称
         UserUtil.assignmentNickName(saleQuotationVoList, BasePo::getCreateUser, SaleQuotationVo::setUserName);
+//        // 赋值买方公司名称
+//        corporationService.attributeAssign(saleQuotationVoList, SaleQuotationVo::getBuyCorporationId, (item, corporation) -> {
+//            item.setBuyCorporationName(corporation.getName());
+//        });
         // 赋值买方公司名称
-        corporationService.attributeAssign(saleQuotationVoList, SaleQuotationVo::getBuyCorporationId, (item, corporation) -> {
+        customerService.attributeAssign(saleQuotationVoList, SaleQuotationVo::getBuyCorporationId, (item, corporation) -> {
             item.setBuyCorporationName(corporation.getName());
         });
         // 赋值卖方公司名称