问题处理

hx-form/pom.xml

@@ -60,6 +60,10 @@
             <groupId>com.fjhx</groupId>
             <artifactId>hx-mes</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-jushuitan</artifactId>
+        </dependency>
 
     </dependencies>
 

hx-form/src/main/java/com/fjhx/form/entity/cost/po/CostControlDetail.java

@@ -42,7 +42,7 @@ public class CostControlDetail extends BasePo {
      * 收款单位
      */
     @Label("收款单位")
-    private String payeeAccountId;
+    private Long payeeAccountId;
 
     /**
      * 申请备注
@@ -156,7 +156,7 @@ public class CostControlDetail extends BasePo {
      * 店铺id
      */
     @Label("店铺信息")
-    private String shopId;
+    private Long shopId;
 
     /**
      * 费用类型

hx-form/src/main/java/com/fjhx/form/entity/cost/vo/CostControlDetailVo.java

@@ -82,4 +82,10 @@ public class CostControlDetailVo extends CostControlDetail {
      */
     private List<CalculateItemVo> calculateItemList;
 
+    private String businessName;
+
+    private String logisticsCompanyName;
+
+    private String payeeAccountName;
+
 }

hx-form/src/main/java/com/fjhx/form/service/cost/impl/CostControlServiceImpl.java

@@ -11,6 +11,7 @@ import com.fjhx.account.entity.calculate.po.CalculateItem;
 import com.fjhx.account.entity.calculate.vo.CalculateItemVo;
 import com.fjhx.account.service.account.AccountPaymentService;
 import com.fjhx.account.service.calculate.CalculateItemService;
+import com.fjhx.account.service.payee.PayeeInfoService;
 import com.fjhx.account.service.payment.PaymentTypeService;
 import com.fjhx.common.controller.Label;
 import com.fjhx.common.enums.FlowStatusEnum1;
@@ -30,10 +31,12 @@ import com.fjhx.form.entity.cost.vo.CostControlVo;
 import com.fjhx.form.mapper.cost.CostControlMapper;
 import com.fjhx.form.service.cost.CostControlDetailService;
 import com.fjhx.form.service.cost.CostControlService;
+import com.fjhx.jushuitan.service.shop.ShopInfoService;
 import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.vo.ContractOutboundInfoVo;
 import com.fjhx.sale.service.contract.ContractOutboundInfoService;
 import com.fjhx.sale.service.contract.ContractService;
+import com.fjhx.supply.service.supplier.SupplierInfoService;
 import com.fjhx.wms.entity.stock.po.StockJournalDetails;
 import com.fjhx.wms.service.stock.StockJournalDetailsService;
 import com.ruoyi.common.core.domain.BaseIdPo;
@@ -84,6 +87,12 @@ public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostC
     private ContractOutboundInfoService contractOutboundInfoService;
     @Autowired
     private AccountPaymentService accountPaymentService;
+    @Autowired
+    private SupplierInfoService supplierInfoService;
+    @Autowired
+    private ShopInfoService shopInfoService;
+    @Autowired
+    private PayeeInfoService payeeInfoService;
 
     @Override
     public Page<CostControlVo> getPage(CostControlSelectDto dto) {
@@ -144,6 +153,26 @@ public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostC
         if (ObjectUtil.isEmpty(costControlDetailVos)) {
             return;
         }
+        //赋值供应商
+        supplierInfoService.attributeAssign(costControlDetailVos, CostControlDetailVo::getSupplierId, (item, supplier) -> {
+            item.setSupplierName(supplier.getName());
+            item.setBusinessName(supplier.getName());
+        });
+        //赋值快递公司
+        logisticsCompanyInfoService.attributeAssign(costControlDetailVos, CostControlDetailVo::getLogisticsCompanyId, (item, logisticsCompany) -> {
+            item.setLogisticsCompanyName(logisticsCompany.getName());
+            item.setBusinessName(logisticsCompany.getName());
+        });
+        //赋值店铺
+        shopInfoService.attributeAssign(costControlDetailVos, CostControlDetailVo::getShopId, (item, shopInfo) -> {
+            item.setShopName(shopInfo.getName());
+            item.setBusinessName(shopInfo.getName());
+        });
+        //赋值收款单位
+        payeeInfoService.attributeAssign(costControlDetailVos, CostControlDetailVo::getPayeeAccountId, (item, payeeInfo) -> {
+            item.setPayeeAccountName(payeeInfo.getName());
+            item.setBusinessName(payeeInfo.getName());
+        });
         result.setCostControlDetailList(costControlDetailVos);
 
         //赋值核算项目