소스 검색

改一下bug

gogs 2 달 전
부모
커밋
9531caeb64
1개의 변경된 파일1개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      app/Service/StatisticService.php

+ 1 - 1
app/Service/StatisticService.php

@@ -983,7 +983,7 @@ class StatisticService extends Service
                         "voucher_remark" => $v['voucher_remark'],
                         "voucher_remark" => $v['voucher_remark'],
                         "voucher_amount" => $v['voucher_amount'],
                         "voucher_amount" => $v['voucher_amount'],
                         "aggregation_amount" => $v['aggregation_amount'],
                         "aggregation_amount" => $v['aggregation_amount'],
-                        "total_amount" => $v['type'] == 1 ?round( $item_salary[$vv['id'] . "_" . date("Y-m", $v['voucher_date'])]['allocated_salary']/100,2) : (isset($device_depreciation[$vv['id'] . "_" . date("Y-m", $v['voucher_date'])]['depreciation']) ?round($device_depreciation[$vv['id'] . "_" . date("Y-m", $v['voucher_date'])]['depreciation']/100,2) : 0),
+                        "total_amount" => $v['type'] == 1 ?round( $item_salary[$vv['item_id'] . "_" . date("Y-m", $v['voucher_date'])]['allocated_salary']/100,2) : (isset($device_depreciation[$vv['id'] . "_" . date("Y-m", $v['voucher_date'])]['depreciation']) ?round($device_depreciation[$vv['id'] . "_" . date("Y-m", $v['voucher_date'])]['depreciation']/100,2) : 0),
                         "fee_id" => $v['fee_id'],
                         "fee_id" => $v['fee_id'],
                         "entrust1_amount" => $v['entrust1_amount'],
                         "entrust1_amount" => $v['entrust1_amount'],
                         "entrust2_amount" => $v['entrust2_amount'],
                         "entrust2_amount" => $v['entrust2_amount'],