费控字段添加

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

@@ -32,5 +32,7 @@ public class CostCalculateItem extends BasePo {
      * 业务id
      */
     private Long businessId;
+    private String businessName;
+    private String businessCode;
 
 }

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

@@ -18,7 +18,4 @@ public class CostCalculateItemVo extends CostCalculateItem {
      * 客户名称
      */
     private String customerName;
-
-    private String businessName;
-
 }

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

@@ -284,6 +284,8 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
      */
     private void addAccountRunningWater(AccountPaymentDto accountPaymentDto, AccountPaymentRecords accountPaymentRecords) {
 
+        AccountPayment dataBaseAp = this.getById(accountPaymentDto.getId());
+
         AccountRunningWater accountRunningWater = new AccountRunningWater();
         accountRunningWater.setCompanyId(SecurityUtils.getCompanyId());
 
@@ -301,6 +303,10 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
         accountRunningWater.setAccountPaymentRecordsId(accountPaymentRecords.getId());
         //添加流水类型
         accountRunningWater.setType("10");
+
+        //赋值费控id
+        accountRunningWater.setCostControlId(dataBaseAp.getCostControlId());
+
         accountRunningWaterService.save(accountRunningWater);
 
     }

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

@@ -231,4 +231,8 @@ public class CostControlDetail extends BasePo {
     private String calculateItemStr;
 
 
+    private String calculateItemType1;
+    private String calculateItemName1;
+    private String calculateItemType2;
+    private String calculateItemName2;
 }