From d44e65536c4ba54a154e3e82b6afe3dd38a7d34e Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Wed, 13 Mar 2024 09:39:16 +0800
Subject: [PATCH] update

---
 app/adminapi/lists/project/ProjectDocumentLists.php    |  2 +-
 app/adminapi/logic/cost_project/CostProjectLogic.php   |  4 ++--
 .../cost_project/CostApprovedProjectValidate.php       | 10 ----------
 .../validate/cost_project/CostProjectValidate.php      |  5 +++--
 app/common/model/cost_project/CostApprovedProject.php  |  5 -----
 5 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/app/adminapi/lists/project/ProjectDocumentLists.php b/app/adminapi/lists/project/ProjectDocumentLists.php
index 657c1da99..97794ecc2 100644
--- a/app/adminapi/lists/project/ProjectDocumentLists.php
+++ b/app/adminapi/lists/project/ProjectDocumentLists.php
@@ -62,7 +62,7 @@ class ProjectDocumentLists extends BaseAdminDataLists implements ListsSearchInte
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function($item){
-				$item['annex'] = json_decode($item['annex'],true);
+//				$item['annex'] = json_decode($item['annex'],true);
 		        $project = Project::field('name,project_code')->where('id',$item['project_id'])->findOrEmpty();
 		        $doc = ProjectDocumentSet::field('large_category,middle_category')->where('id',$item['classify_id'])->findOrEmpty();
 		        $item['project_name'] = $project['name'];
diff --git a/app/adminapi/logic/cost_project/CostProjectLogic.php b/app/adminapi/logic/cost_project/CostProjectLogic.php
index 0a394dc7d..374388780 100644
--- a/app/adminapi/logic/cost_project/CostProjectLogic.php
+++ b/app/adminapi/logic/cost_project/CostProjectLogic.php
@@ -69,7 +69,7 @@ class CostProjectLogic extends BaseLogic
                 'generalize' => $params['generalize'],
                 'note' => $params['note'],
                 'remark' => $params['remark'],
-                'annex' => $params['annex']
+                'annex' => $params['annex'] ? json_encode($params['annex']) : null,
             ]);
             if ($params['person_id']) {
                 $arr = [];
@@ -127,7 +127,7 @@ class CostProjectLogic extends BaseLogic
                 'generalize' => $params['generalize'],
                 'note' => $params['note'],
                 'remark' => $params['remark'],
-                'annex' => $params['annex']
+	            'annex' => $params['annex'] ? json_encode($params['annex']) : null,
             ]);
             if ($params['person_id']) {
                 $arr = [];
diff --git a/app/adminapi/validate/cost_project/CostApprovedProjectValidate.php b/app/adminapi/validate/cost_project/CostApprovedProjectValidate.php
index 90ac7b273..4fdb46511 100644
--- a/app/adminapi/validate/cost_project/CostApprovedProjectValidate.php
+++ b/app/adminapi/validate/cost_project/CostApprovedProjectValidate.php
@@ -213,15 +213,5 @@ class CostApprovedProjectValidate extends BaseValidate
 		}
 		return true;
 	}
-	
-	public function checkAnnex($value): bool|string
-	{
-		if(!empty($value) && $value != ''){
-			if(!is_array($value)){
-				return '附件格式错误';
-			}
-		}
-		return true;
-	}
 
 }
\ No newline at end of file
diff --git a/app/adminapi/validate/cost_project/CostProjectValidate.php b/app/adminapi/validate/cost_project/CostProjectValidate.php
index 1032f716e..c38ee5e73 100644
--- a/app/adminapi/validate/cost_project/CostProjectValidate.php
+++ b/app/adminapi/validate/cost_project/CostProjectValidate.php
@@ -42,6 +42,7 @@ class CostProjectValidate extends BaseValidate
         'principal' => 'require',
         'invest' => 'require',
         'aunit' => 'require',
+	    'annex' => 'checkAnnex'
     ];
 
 
@@ -71,7 +72,7 @@ class CostProjectValidate extends BaseValidate
      */
     public function sceneAdd()
     {
-        return $this->only(['project_num','project_name','contract_id','starting','endtime','jhgq','principal','invest','aunit']);
+        return $this->only(['project_num','project_name','contract_id','starting','endtime','jhgq','principal','invest','aunit','annex']);
     }
 
 
@@ -83,7 +84,7 @@ class CostProjectValidate extends BaseValidate
      */
     public function sceneEdit()
     {
-        return $this->only(['id','project_num','project_name','contract_id','starting','endtime','jhgq','principal','invest','aunit']);
+        return $this->only(['id','project_num','project_name','contract_id','starting','endtime','jhgq','principal','invest','aunit','annex']);
     }
 
 
diff --git a/app/common/model/cost_project/CostApprovedProject.php b/app/common/model/cost_project/CostApprovedProject.php
index 1b24635cb..0d93faad2 100644
--- a/app/common/model/cost_project/CostApprovedProject.php
+++ b/app/common/model/cost_project/CostApprovedProject.php
@@ -102,9 +102,4 @@ class CostApprovedProject extends BaseModel
 	{
 		return !empty($value) ? date('Y-m-d', $value) : '';
 	}
-	
-	public function getAnnexAttr($value)
-	{
-		return !empty($value) ? json_decode($value,true) : '';
-	}
 }
\ No newline at end of file