利润结算

hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractProductVo.java

@@ -130,7 +130,7 @@ public class ContractProductVo extends ContractProduct {
     /**
      * 质检状态
      */
-    private String qualityStatus;
+    private Integer qualityStatus;
 
     /**
      * 质检时间

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractProductServiceImpl.java

@@ -9,14 +9,17 @@ import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.item.service.product.ProductClassifyService;
 import com.fjhx.item.service.product.ProductInfoService;
+import com.fjhx.kd100.entity.company.po.CompanyInfo;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
 import com.fjhx.purchase.entity.purchase.vo.PurchaseDetailVo;
 import com.fjhx.purchase.service.purchase.PurchaseDetailService;
 import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.po.ContractProduct;
+import com.fjhx.sale.entity.quality.po.EhsdQuality;
 import com.fjhx.sale.mapper.contract.ContractProductMapper;
 import com.fjhx.sale.service.contract.ContractProductService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.sale.service.quality.EhsdQualityService;
 import com.fjhx.supply.service.supplier.SupplierInfoService;
 import com.obs.services.internal.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -70,6 +73,12 @@ public class ContractProductServiceImpl extends ServiceImpl<ContractProductMappe
     @Autowired
     private SupplierInfoService supplierInfoService;
 
+    @Autowired
+    private EhsdQualityService ehsdQualityService;
+
+    @Autowired
+    private CorporationService corporationService;
+
     /**
      * 分页
      * @param dto
@@ -205,9 +214,12 @@ public class ContractProductServiceImpl extends ServiceImpl<ContractProductMappe
                 item.setCustomerName(customer.getName());
             });
             // 供应商名称
-            supplierInfoService.attributeAssign(list, ContractProductVo::getSellCorporationId, (item, supplier) -> {
+            corporationService.attributeAssign(list, ContractProductVo::getSellCorporationId, (item, supplier) -> {
                 item.setSupplyName(supplier.getName());
             });
+            ehsdQualityService.attributeAssign(list, ContractProductVo::getId, (item, ehsdQuality) -> {
+                item.setQualityStatus(ehsdQuality.getStatus());
+            });
         }
         return page;
     }

hx-sale/src/main/resources/mapper/contract/ContractProductMapper.xml

@@ -33,11 +33,13 @@
                     t2.user_name AS userName,
                     t2.version AS contractVersion,
                     t1.expend_quantity AS expendQuantity,
+                    t2.sell_corporation_id,
+                    t2.buy_corporation_id,
                     ( SELECT create_time FROM claim_contract WHERE contract_id = t2.id ORDER BY create_time DESC LIMIT 1 ) AS claimTime
-                    FROM
+                FROM
                     contract_product t1
-                    LEFT JOIN contract t2 ON t1.contract_id = t2.id
-                    WHERE
+                LEFT JOIN contract t2 ON t1.contract_id = t2.id
+                WHERE
                     t2.`status` >= 30
                     AND t2.`status` < 88 AND t1.expend_quantity > 0
         UNION ALL
@@ -53,6 +55,8 @@
                     t2.user_name AS userName,
                     t2.versions AS contractVersion,
                     t1.expend_quantity AS expendQuantity,
+                    t2.sell_corporation_id,
+                    t2.buy_corporation_id,
                     ( SELECT create_time FROM claim_contract WHERE contract_id = t2.id ORDER BY create_time DESC LIMIT 1 ) AS claimTime
                 FROM
                     sample_product t1