From 1111ca32c99d6dc9934a5c4f1bb21458a9d63315 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Wed, 20 Dec 2023 14:35:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lists/cost/CostBudgetAdjustDetailLists.php |  2 +-
 .../lists/cost/CostBudgetDetailLists.php       |  2 +-
 .../logic/cost/CostBudgetAdjustLogic.php       |  5 +++++
 .../validate/cost/CostBudgetAdjustValidate.php | 18 ++++++++++--------
 app/common/model/cost/CostBudgetAdjust.php     | 11 ++++++++++-
 .../model/cost/CostBudgetAdjustDetail.php      |  5 ++++-
 6 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/app/adminapi/lists/cost/CostBudgetAdjustDetailLists.php b/app/adminapi/lists/cost/CostBudgetAdjustDetailLists.php
index 9bf6001e8..ea4f5e3ed 100644
--- a/app/adminapi/lists/cost/CostBudgetAdjustDetailLists.php
+++ b/app/adminapi/lists/cost/CostBudgetAdjustDetailLists.php
@@ -61,7 +61,7 @@ class CostBudgetAdjustDetailLists extends BaseAdminDataLists implements ListsSea
             ->leftJoin('cost_budget_adjust cbd','cbd.id = cbad.cost_budget_adjust_id')
             ->leftJoin('orgs o','o.id = cbd.org_id')
             ->leftJoin('dept d','d.id = cbd.dept_id')
-            ->field('cbad.*, d.name as dept_name, o.name as org_name, cbd.years, cs.sn, cs.subject1, cs.subject2')
+            ->field('cbad.*, d.name as dept_name, o.name as org_name, cbd.years, cbd.document_preparation_time, cs.sn, cs.subject1, cs.subject2')
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['cbad.id' => 'desc'])
             ->select()->each(function($item, $key){
diff --git a/app/adminapi/lists/cost/CostBudgetDetailLists.php b/app/adminapi/lists/cost/CostBudgetDetailLists.php
index 5379e3dc2..2a6721cec 100644
--- a/app/adminapi/lists/cost/CostBudgetDetailLists.php
+++ b/app/adminapi/lists/cost/CostBudgetDetailLists.php
@@ -61,7 +61,7 @@ class CostBudgetDetailLists extends BaseAdminDataLists implements ListsSearchInt
             ->leftJoin('cost_budget cb','cb.id = cbd.cost_budget_id')
             ->leftJoin('orgs o','o.id = cb.org_id')
             ->leftJoin('dept d','d.id = cb.dept_id')
-            ->field('cbd.*, d.name as dept_name, o.name as org_name, cb.years, cs.sn, cs.subject1, cs.subject2')
+            ->field('cbd.*, d.name as dept_name, o.name as org_name, cb.years, cb.document_preparation_time, cs.sn, cs.subject1, cs.subject2')
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['cbd.id' => 'desc'])
             ->select()->each(function($item, $key){
diff --git a/app/adminapi/logic/cost/CostBudgetAdjustLogic.php b/app/adminapi/logic/cost/CostBudgetAdjustLogic.php
index 5e8481fb8..6c54111f8 100644
--- a/app/adminapi/logic/cost/CostBudgetAdjustLogic.php
+++ b/app/adminapi/logic/cost/CostBudgetAdjustLogic.php
@@ -152,6 +152,11 @@ class CostBudgetAdjustLogic extends BaseLogic
     {
         $costBudgetAdjust = CostBudgetAdjust::findOrEmpty($params['id']);
         $costBudgetAdjust->detail;
+        foreach ($costBudgetAdjust->detail as &$item) {
+            $item->subject;
+        }
+        $costBudgetAdjust->org;
+        $costBudgetAdjust->dept;
         return $costBudgetAdjust->toArray();
     }
 }
\ No newline at end of file
diff --git a/app/adminapi/validate/cost/CostBudgetAdjustValidate.php b/app/adminapi/validate/cost/CostBudgetAdjustValidate.php
index 97c95f5b1..6981f2cd6 100644
--- a/app/adminapi/validate/cost/CostBudgetAdjustValidate.php
+++ b/app/adminapi/validate/cost/CostBudgetAdjustValidate.php
@@ -31,10 +31,12 @@ class CostBudgetAdjustValidate extends BaseValidate
       * @var string[]
       */
     protected $rule = [
-        'id' => 'require',
-        'approve_id' => 'require',
-        'years' => 'require',
-        'document_preparation_time' => 'require',
+        'id' => 'require',
+        'org_id' => 'require',
+        'dept_id' => 'require',
+        'approve_id' => 'require',
+        'years' => 'require',
+        'document_preparation_time' => 'require',
     ];
 
 
@@ -43,10 +45,10 @@ class CostBudgetAdjustValidate extends BaseValidate
      * @var string[]
      */
     protected $field = [
-        'id' => 'id',
-        'approve_id' => '审批id',
-        'years' => '年份',
-        'document_preparation_time' => '制单时间',
+        'id' => 'id',
+        'approve_id' => '审批id',
+        'years' => '年份',
+        'document_preparation_time' => '制单时间',
     ];
 
 
diff --git a/app/common/model/cost/CostBudgetAdjust.php b/app/common/model/cost/CostBudgetAdjust.php
index 87cfcba8a..638e152ae 100644
--- a/app/common/model/cost/CostBudgetAdjust.php
+++ b/app/common/model/cost/CostBudgetAdjust.php
@@ -40,6 +40,15 @@ class CostBudgetAdjust extends BaseModel
     public function detail()
     {
         return $this->hasMany(\app\common\model\cost\CostBudgetAdjustDetail::class, 'cost_budget_adjust_id', 'id');
-    }
+    }
 
+    public function org()
+    {
+        return $this->hasOne(\app\common\model\dept\Orgs::class, 'id', 'org_id');
+    }
+
+    public function dept()
+    {
+        return $this->hasOne(\app\common\model\dept\Dept::class, 'id', 'dept_id');
+    }
 }
\ No newline at end of file
diff --git a/app/common/model/cost/CostBudgetAdjustDetail.php b/app/common/model/cost/CostBudgetAdjustDetail.php
index 5e7d62208..c45170b9e 100644
--- a/app/common/model/cost/CostBudgetAdjustDetail.php
+++ b/app/common/model/cost/CostBudgetAdjustDetail.php
@@ -30,5 +30,8 @@ class CostBudgetAdjustDetail extends BaseModel
     protected $name = 'cost_budget_adjust_detail';
     protected $deleteTime = 'delete_time';
 
-    
+    public function subject()
+    {
+        return $this->belongsTo(\app\common\model\cost\CostSubject::class, 'cost_subject_id');
+    }
 }
\ No newline at end of file