费控核算方式改名

hx-form/src/main/java/com/fjhx/form/entity/cost/dto/CostControlDetailDto.java

@@ -1,6 +1,6 @@
 package com.fjhx.form.entity.cost.dto;
 
-import com.fjhx.account.entity.calculate.po.CalculateItem;
+import com.fjhx.account.entity.calculate.po.CostCalculateItem;
 import com.fjhx.file.entity.ObsFile;
 import com.fjhx.form.entity.cost.po.CostControlDetail;
 import lombok.Getter;
@@ -30,5 +30,5 @@ public class CostControlDetailDto extends CostControlDetail {
     /**
      * 核算项目列表
      */
-    private List<CalculateItem> calculateItemList;
+    private List<CostCalculateItem> costCalculateItemList;
 }

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

@@ -1,6 +1,6 @@
 package com.fjhx.form.entity.cost.vo;
 
-import com.fjhx.account.entity.calculate.vo.CalculateItemVo;
+import com.fjhx.account.entity.calculate.vo.CostCalculateItemVo;
 import com.fjhx.common.controller.Label;
 import com.fjhx.file.entity.ObsFile;
 import com.fjhx.form.entity.cost.po.CostControlDetail;
@@ -80,7 +80,7 @@ public class CostControlDetailVo extends CostControlDetail {
     /**
      * 核算项目列表
      */
-    private List<CalculateItemVo> calculateItemList;
+    private List<CostCalculateItemVo> calculateItemList;
 
     private String businessName;
 

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

@@ -8,12 +8,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.account.entity.account.po.AccountPayment;
 import com.fjhx.account.entity.account.po.AccountSubjects;
-import com.fjhx.account.entity.calculate.po.CalculateItem;
-import com.fjhx.account.entity.calculate.vo.CalculateItemVo;
+import com.fjhx.account.entity.calculate.po.CostCalculateItem;
+import com.fjhx.account.entity.calculate.vo.CostCalculateItemVo;
 import com.fjhx.account.service.account.AccountManagementService;
 import com.fjhx.account.service.account.AccountPaymentService;
 import com.fjhx.account.service.account.AccountSubjectsService;
-import com.fjhx.account.service.calculate.CalculateItemService;
+import com.fjhx.account.service.calculate.CostCalculateItemService;
 import com.fjhx.account.service.payee.PayeeInfoService;
 import com.fjhx.account.service.payment.PaymentTypeService;
 import com.fjhx.common.controller.Label;
@@ -97,7 +97,7 @@ public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostC
     @Autowired
     private StockJournalDetailsService stockJournalDetailsService;
     @Autowired
-    private CalculateItemService calculateItemService;
+    private CostCalculateItemService costCalculateItemService;
     @Autowired
     private CustomerService customerService;
     @Autowired
@@ -217,14 +217,14 @@ public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostC
         result.setCostControlDetailList(costControlDetailVos);
 
         //赋值核算项目
-        Map<Long, List<CalculateItemVo>> ciMap = new HashMap<>();
+        Map<Long, List<CostCalculateItemVo>> ciMap = new HashMap<>();
         List<Long> ccdIds = costControlDetailVos.stream().map(CostControlDetail::getId).collect(Collectors.toList());
-        List<CalculateItemVo> ciList = calculateItemService.getList(IWrapper.getWrapper().in(CalculateItem::getCostControlDetailId, ccdIds));
+        List<CostCalculateItemVo> ciList = costCalculateItemService.getList(IWrapper.getWrapper().in(CostCalculateItem::getCostControlDetailId, ccdIds));
         if (ObjectUtil.isNotEmpty(ciList)) {
             //赋值核算项目名称
             setCalculateItemInfo(ciList);
 
-            ciMap = ciList.stream().collect(Collectors.groupingBy(CalculateItem::getCostControlDetailId));
+            ciMap = ciList.stream().collect(Collectors.groupingBy(CostCalculateItem::getCostControlDetailId));
         }
         //赋值记账科目信息
         Map<Long, AccountSubjects> accountSubjectsMap = accountSubjectsService.mapKEntity(AccountSubjects::getId, q -> q.orderByAsc(AccountSubjects::getId));
@@ -250,8 +250,8 @@ public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostC
         }
     }
 
-    private void setCalculateItemInfo(List<CalculateItemVo> ciList) {
-        for (CalculateItemVo calculateItemVo : ciList) {
+    private void setCalculateItemInfo(List<CostCalculateItemVo> ciList) {
+        for (CostCalculateItemVo calculateItemVo : ciList) {
             switch (calculateItemVo.getType()) {
                 case "部门":
                 case "核算中心":
@@ -395,12 +395,12 @@ public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostC
             ObsFileUtil.editFile(costControlDetailDto.getInvoiceFileList(), costControlDetailDto.getId(), 10);
 
             //保存核算项目
-            List<CalculateItem> calculateItemList = costControlDetailDto.getCalculateItemList();
-            if (calculateItemList == null) {
-                calculateItemList = new ArrayList<>();
+            List<CostCalculateItem> costCalculateItemList = costControlDetailDto.getCostCalculateItemList();
+            if (costCalculateItemList == null) {
+                costCalculateItemList = new ArrayList<>();
             }
-            calculateItemList.forEach(item -> item.setCostControlDetailId(costControlDetailDto.getId()));
-            calculateItemService.editLinked(calculateItemList, CalculateItem::getCostControlDetailId, costControlDetailDto.getId());
+            costCalculateItemList.forEach(item -> item.setCostControlDetailId(costControlDetailDto.getId()));
+            costCalculateItemService.editLinked(costCalculateItemList, CostCalculateItem::getCostControlDetailId, costControlDetailDto.getId());
 
 
             //标记流水为结算中