增加功能:费用单增加费用大类

cost-service/src/main/java/com/blt/other/module/cost/service/impl/CostApiServiceImpl.java

 package com.blt.other.module.cost.service.impl;
 
+import com.bailuntec.common.StringUtils;
 import com.bailuntec.cost.api.dto.*;
 import com.bailuntec.cost.api.request.ManageCostListReq;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -200,7 +201,7 @@ public class CostApiServiceImpl implements CostApiService {
         }
         costDomain.setTypeNo(costTypeDomain.getTypeNo());
         costDomain.setTypeName(costTypeDomain.getTypeName());
-        costDomain.setCategoryName(costTypeDomain.getCategoryName());
+        costDomain.setCategoryName(StringUtils.isNotBlank(costTypeDomain.getCategoryName()) ? costTypeDomain.getCategoryName() : (StringUtils.isNotBlank(costDomain.getProject()) && !costDomain.getProject().equals("集团") ? "管理成本" : "日常费用"));
         costDomain.setAccountingSubjectId(costTypeDomain.getAccountingSubjectId());
         costDomain.setAccountingSubjectNo(costTypeDomain.getAccountingSubjectNo());
         costDomain.setNsAccountingSubjectId(costTypeDomain.getNsAccountingSubjectId());
@@ -252,7 +253,7 @@ public class CostApiServiceImpl implements CostApiService {
             }
             costDomain.setTypeNo(costTypeDomain.getTypeNo());
             costDomain.setTypeName(costTypeDomain.getTypeName());
-            costDomain.setCategoryName(costTypeDomain.getCategoryName());
+            costDomain.setCategoryName(StringUtils.isNotBlank(costTypeDomain.getCategoryName()) ? costTypeDomain.getCategoryName() : (StringUtils.isNotBlank(costDomain.getProject()) && !costDomain.getProject().equals("集团") ? "管理成本" : "日常费用"));
             costDomain.setAccountingSubjectId(costTypeDomain.getAccountingSubjectId());
             costDomain.setAccountingSubjectNo(costTypeDomain.getAccountingSubjectNo());
             costDomain.setNsAccountingSubjectId(costTypeDomain.getNsAccountingSubjectId());

cost-service/src/main/java/com/blt/other/module/cost/service/impl/CostDetailServiceImpl.java

@@ -99,7 +99,7 @@ public class CostDetailServiceImpl extends ServiceImpl<CostDetailDao, CostDetail
             costDetailDomain.setTypeId(costTypeDomain.getId());
             costDetailDomain.setTypeNo(costTypeDomain.getTypeNo());
             costDetailDomain.setTypeName(costTypeDomain.getTypeName());
-            costDetailDomain.setCategoryName(costTypeDomain.getCategoryName());
+            costDetailDomain.setCategoryName(StringUtils.isNotBlank(costTypeDomain.getCategoryName()) ? costTypeDomain.getCategoryName() : (StringUtils.isNotBlank(costDetailDomain.getProject()) && !costDetailDomain.getProject().equals("集团") ? "管理成本" : "日常费用"));
             costDetailDomain.setAccountingSubjectNo(accountingSubject.getSubjectNo());
             costDetailDomain.setAccountingSubjectName(accountingSubject.getName());
         }

cost-service/src/main/java/com/blt/other/module/cost/service/impl/cost/AbstractCostService.java

@@ -185,7 +185,7 @@ public abstract class AbstractCostService implements CostService {
                 if (accountingSubject != null) {
                     costDomain.setTypeNo(costDomain.getTypeNo());
                     costDomain.setTypeName(costTypeDomain.getTypeName());
-                    costDomain.setCategoryName(costTypeDomain.getCategoryName());
+                    costDomain.setCategoryName(StringUtils.isNotBlank(costTypeDomain.getCategoryName()) ? costTypeDomain.getCategoryName() : (StringUtils.isNotBlank(costDomain.getProject()) && !costDomain.getProject().equals("集团") ? "管理成本" : "日常费用"));
                     costDomain.setAccountingSubjectNo(accountingSubject.getSubjectNo());
                     costDomain.setAccountingSubjectName(accountingSubject.getName());
                 }