新增归属公司名称

hx-purchase/src/main/java/com/fjhx/purchase/controller/subscribe/SubscribeDetailController.java

@@ -1,15 +1,18 @@
 package com.fjhx.purchase.controller.subscribe;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.fjhx.common.constant.SourceConstant;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.purchase.entity.subscribe.vo.SubscribeDetailVo;
-import com.fjhx.purchase.entity.subscribe.dto.SubscribeDetailSelectDto;
+import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.purchase.entity.subscribe.dto.SubscribeDetailDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.purchase.entity.subscribe.dto.SubscribeDetailSelectDto;
+import com.fjhx.purchase.entity.subscribe.vo.SubscribeDetailVo;
 import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+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;
 import java.util.Map;

hx-purchase/src/main/java/com/fjhx/purchase/entity/subscribe/vo/SubscribeDetailVo.java

@@ -102,4 +102,9 @@ public class SubscribeDetailVo extends SubscribeDetail {
      */
     private Long corporationId;
 
+    /**
+     * 归属公司名称
+     */
+    private String corporationName;
+
 }

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeDetailServiceImpl.java

@@ -12,6 +12,7 @@ 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.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.item.entity.product.vo.ProductInfoVo;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
@@ -54,14 +55,19 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
 
     @Autowired
     private ProductInfoService productInfoService;
+
     @Autowired
-    WarehouseService warehouseService;
+    private WarehouseService warehouseService;
+
     @Autowired
-    PurchaseDetailService purchaseDetailService;
+    private PurchaseDetailService purchaseDetailService;
 
     @Autowired
     private DictTenantDataService dictTenantDataService;
 
+    @Autowired
+    private CorporationService corporationService;
+
     /**
      * 分页
      *
@@ -143,6 +149,10 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
             subscribeDetailVo.setPurchaseCount(count);
         }
 
+        corporationService.attributeAssign(list, SubscribeDetailVo::getCorporationId, (item, corporation) -> {
+            item.setCorporationName(corporation.getName());
+        });
+
         return page;
     }
 

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

@@ -168,8 +168,18 @@ public class ContractProductVo extends ContractProduct {
     private Long sampleId;
 
     /**
+     * 合同模板id
+     */
+    private Long contractTemplateId;
+
+    /**
      * 归属公司id
      */
     private Long corporationId;
 
+    /**
+     * 归属公司名称
+     */
+    private String corporationName;
+
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.enums.FlowStatusEnum;
+import com.fjhx.common.service.contract.ContractTemplateService;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.item.service.product.ProductClassifyService;
@@ -59,8 +60,12 @@ public class ContractProductServiceImpl extends ServiceImpl<ContractProductMappe
     @Autowired
     private CorporationService corporationService;
 
+    @Autowired
+    private ContractTemplateService contractTemplateService;
+
     /**
      * 分页
+     *
      * @param dto
      * @return
      */
@@ -95,6 +100,16 @@ public class ContractProductServiceImpl extends ServiceImpl<ContractProductMappe
             item.setProductCategory(productClassify.getName());
         });
 
+        // 赋值公司id
+        contractTemplateService.attributeAssign(list, ContractProductVo::getContractTemplateId, (item, contractTemplate) -> {
+            item.setCorporationId(contractTemplate.getCorporationId());
+        });
+
+        // 赋值公司名称
+        corporationService.attributeAssign(list, ContractProductVo::getCorporationId, (item, corporation) -> {
+            item.setCorporationName(corporation.getName());
+        });
+
         return page;
     }
 

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

@@ -6,16 +6,16 @@
         SELECT t1.id,
                t1.contract_id,
                t1.product_id,
-               t2.`code`          AS contractCode,
-               t2.user_name       AS userName,
-               t2.version         AS contractVersion,
-               t1.expend_quantity AS expendQuantity,
+               t2.`code`               AS contractCode,
+               t2.user_name            AS userName,
+               t2.version              AS contractVersion,
+               t1.expend_quantity      AS expendQuantity,
                (SELECT create_time
                 FROM claim_contract
                 WHERE contract_id = t2.id
                 ORDER BY create_time DESC
-                LIMIT 1)          AS claimTime,
-               t2.corporation_id  AS corporationId
+                LIMIT 1)               AS claimTime,
+               t2.contract_template_id AS contractTemplateId
         FROM contract_product t1
                  LEFT JOIN contract t2 ON t1.contract_id = t2.id
             ${ew.customSqlSegment}