问题处理

hx-account/src/main/java/com/fjhx/account/entity/account/po/AccountPayment.java

@@ -132,6 +132,7 @@ public class AccountPayment extends BasePo {
      * 归属公司id
      */
     private Long companyId;
+    private String companyIds;
 
     /**
      * 费控id

hx-account/src/main/java/com/fjhx/account/entity/account/vo/AccountSubjectsVo.java

@@ -24,4 +24,6 @@ public class AccountSubjectsVo extends AccountSubjects {
      */
     private String subjectsCalculateItemName;
 
+    private String accountSubjectsNames;
+
 }

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountSubjectsServiceImpl.java

@@ -15,7 +15,10 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -38,6 +41,27 @@ public class AccountSubjectsServiceImpl extends ServiceImpl<AccountSubjectsMappe
 
         wrapper.orderByDesc("asu", AccountSubjects::getId);
         List<AccountSubjectsVo> list = this.baseMapper.getList(wrapper);
+
+        if (ObjectUtil.isEmpty(list)) {
+            return list;
+        }
+
+        //赋值记账科目信息
+        Map<Long, AccountSubjects> accountSubjectsMap = this.mapKEntity(AccountSubjects::getId, q -> q.orderByAsc(AccountSubjects::getId));
+
+        for (AccountSubjectsVo accountSubjectsVo : list) {
+            //赋值记账科目树
+            int iCount = 0;
+            List<String> subjectsNameGroup = new ArrayList<>();
+            AccountSubjects accountSubjects = accountSubjectsMap.get(accountSubjectsVo.getId());
+            while (accountSubjects != null && iCount < 50) {
+                iCount++;
+                subjectsNameGroup.add(0, accountSubjects.getSubjectsName());
+                accountSubjects = accountSubjectsMap.get(accountSubjects.getParentId());
+            }
+            accountSubjectsVo.setAccountSubjectsNames(subjectsNameGroup.stream().collect(Collectors.joining(" / ")));
+        }
+
         return list;
     }
 

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

@@ -69,7 +69,7 @@ public class CostControl extends BasePo {
      * 所属中心
      */
     @Label("所属中心")
-    private Long companyId;
+    private String companyId;
 
     /**
      * 所属部门

hx-form/src/main/java/com/fjhx/form/flow/CostControlFlow.java

@@ -124,15 +124,14 @@ public class CostControlFlow extends FlowDelegate {
             payment.setBusinessCurrency("CNY");
             payment.setAccountOpening(costControl.getAccountNumber());
             payment.setPaymentMethod(costControl.getPaymentMethod());
-            payment.setCompanyId(costControl.getCompanyId());
-            payment.setCorporationId(costControl.getCompanyId());
+            payment.setCompanyIds(costControl.getCompanyId());
             payment.setDepartmentId(SecurityUtils.getDeptId());
 
             accountPaymentService.save(payment);
         } else {
             //添加一条资金流水
             AccountRunningWater accountRunningWater = new AccountRunningWater();
-            accountRunningWater.setCompanyId(costControl.getCompanyId());
+            accountRunningWater.setCompanyId(Long.parseLong(costControl.getCompanyId()));
             accountRunningWater.setAccountManagementId(null);
             accountRunningWater.setStatus("10");// 收入
             accountRunningWater.setBusinessId(costControl.getId());