From 35773b7425978b49438999aa8c034aeb2dfb6227 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Fri, 24 May 2024 10:11:29 +0800
Subject: [PATCH] update

---
 .../cost_project/CostApprovedProjectController.php           | 2 ++
 app/adminapi/lists/financial/FinancialInvoiceLists.php       | 3 ++-
 app/adminapi/lists/financial/FinancialRefundLists.php        | 5 ++++-
 app/adminapi/lists/works/rcbg/OaWorkCommentLists.php         | 2 +-
 .../logic/supervision_project/SupervisionProjectLogic.php    | 3 +++
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/adminapi/controller/cost_project/CostApprovedProjectController.php b/app/adminapi/controller/cost_project/CostApprovedProjectController.php
index 669409f29..ff4f730ea 100644
--- a/app/adminapi/controller/cost_project/CostApprovedProjectController.php
+++ b/app/adminapi/controller/cost_project/CostApprovedProjectController.php
@@ -129,6 +129,8 @@
 						default => 0,
 					};
 					$data['project_id'] = $project['id'];
+					$rate = bcdiv($data['total_refund_amount'], $data['signed_amount'], 2);
+					$data['refund_rate'] = ($rate * 100).'%';
 				})
 				->toArray();
 			$count = MarketingCustom::where($where)->where('status', 1)->count();
diff --git a/app/adminapi/lists/financial/FinancialInvoiceLists.php b/app/adminapi/lists/financial/FinancialInvoiceLists.php
index 672b3d22d..52098774b 100644
--- a/app/adminapi/lists/financial/FinancialInvoiceLists.php
+++ b/app/adminapi/lists/financial/FinancialInvoiceLists.php
@@ -77,7 +77,7 @@
 					$data['sign_time'] = $contract['create_time'];
 					$data['invoice_type_text'] = $data->invoice_type_text;
 					$data['refund_amount'] = FinancialRefund::where('invoice_id', $data['id'])->sum('amount') ?? 0.00;
-					$rate = bcdiv($data['refund_amount'], $data['apply_amount'], 2);
+					$rate = bcdiv($data['refund_amount'], $contract['signed_amount'], 2);
 					if (($rate * 100) <= 0) {
 						$data['is_refund'] = '未到账(设定0%)';
 					} elseif (($rate * 100) <= 30) {
@@ -89,6 +89,7 @@
 					} else {
 						$data['is_refund'] = '已到账(设定100%)';
 					}
+					$data['refund_rate'] = ($rate * 100).'%';
 					$last_refund = FinancialRefund::where('invoice_id', $data['id'])->order('id desc')->findOrEmpty();
 					$data['refund_date'] = $last_refund['create_time'] ?? '';
 				})
diff --git a/app/adminapi/lists/financial/FinancialRefundLists.php b/app/adminapi/lists/financial/FinancialRefundLists.php
index 5db39dcca..75b9ae3db 100644
--- a/app/adminapi/lists/financial/FinancialRefundLists.php
+++ b/app/adminapi/lists/financial/FinancialRefundLists.php
@@ -63,15 +63,18 @@
 				->limit($this->limitOffset, $this->limitLength)
 				->order(['id' => 'desc'])
 				->select()->each(function ($data) {
-					$contract = MarketingContract::field('contract_name,contract_type,part_a,part_b')->where('id', $data['contract_id'])->findOrEmpty();
+					$contract = MarketingContract::field('contract_name,contract_type,signed_amount,part_a,part_b')->where('id', $data['contract_id'])->findOrEmpty();
 					$invoice = FinancialInvoice::field('invoice_code,apply_amount')->where('id', $data['invoice_id'])->findOrEmpty();
 					$custom = MarketingCustom::field('name')->where('id', $contract['part_a'])->findOrEmpty();
 					$data['contract_name'] = $contract['contract_name'];
 					$data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : '';
 					$data['part_a'] = $custom['name'];
 					$data['part_b'] = $contract['part_b'];
+					$data['signed_amount'] = $contract['signed_amount'];
 					$data['invoice_code'] = $invoice['invoice_code'];
 					$data['apply_amount'] = $invoice['apply_amount'];
+					$rate = bcdiv($data['amount'], $contract['signed_amount'], 2);
+					$data['refund_rate'] = ($rate * 100).'%';
 				})
 				->toArray();
 		}
diff --git a/app/adminapi/lists/works/rcbg/OaWorkCommentLists.php b/app/adminapi/lists/works/rcbg/OaWorkCommentLists.php
index a97e3a29a..e374ddcb7 100644
--- a/app/adminapi/lists/works/rcbg/OaWorkCommentLists.php
+++ b/app/adminapi/lists/works/rcbg/OaWorkCommentLists.php
@@ -56,7 +56,7 @@ class OaWorkCommentLists extends BaseAdminDataLists implements ListsSearchInterf
     public function lists(): array
     {
         return OaWorkComment::where($this->searchWhere)
-            ->field(['id', 'work_id', 'admin_id', 'content'])
+            ->field(['id', 'work_id', 'admin_id', 'content','create_time'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function($data){
diff --git a/app/adminapi/logic/supervision_project/SupervisionProjectLogic.php b/app/adminapi/logic/supervision_project/SupervisionProjectLogic.php
index 220cc8f66..a174ec264 100644
--- a/app/adminapi/logic/supervision_project/SupervisionProjectLogic.php
+++ b/app/adminapi/logic/supervision_project/SupervisionProjectLogic.php
@@ -169,6 +169,9 @@ class SupervisionProjectLogic extends BaseLogic
         $data['build_unit_name'] = $data->build_unit_name_text;
         $data['contract_name'] = $data->contract_name_text;
         $data['project_manager_name'] = $data->project_manager_name_text;
+	    $data['implementation_department_name'] = $data->implementation_department_name_text;
+	    $data['supervision_department_name'] = $data->supervision_department_name_text;
+	    $data['project_department_name'] = $data->project_department_name_text;
 
         return $data->toArray();
     }