From 3b7a1eb39c00c2357af9d6fb153e2578c043c3b4 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Tue, 12 Mar 2024 09:33:44 +0800
Subject: [PATCH] update

---
 app/adminapi/logic/manage_basic/ManageCompanyLogic.php    | 2 +-
 app/adminapi/logic/manage_basic/ManageProjectLogic.php    | 8 ++++----
 .../validate/manage_basic/ManageProjectValidate.php       | 8 --------
 .../manage_communication/ManageAcceptDocValidate.php      | 8 --------
 .../manage_communication/ManageInfoReportValidate.php     | 8 --------
 .../manage_communication/ManageSendDocValidate.php        | 8 --------
 .../manage_invest/ManageEngineeringChangesValidate.php    | 8 --------
 .../ManageMonthlyProgressReportValidate.php               | 8 --------
 app/common/model/manage_basic/ManageProject.php           | 4 ----
 app/common/model/manage_communication/ManageAcceptDoc.php | 5 -----
 .../model/manage_communication/ManageInfoReport.php       | 4 ----
 app/common/model/manage_communication/ManageSendDoc.php   | 5 -----
 .../model/manage_invest/ManageEngineeringChanges.php      | 5 -----
 .../model/manage_progress/ManageMonthlyProgressReport.php | 5 -----
 14 files changed, 5 insertions(+), 81 deletions(-)

diff --git a/app/adminapi/logic/manage_basic/ManageCompanyLogic.php b/app/adminapi/logic/manage_basic/ManageCompanyLogic.php
index 510bd8a2f..7d887e114 100644
--- a/app/adminapi/logic/manage_basic/ManageCompanyLogic.php
+++ b/app/adminapi/logic/manage_basic/ManageCompanyLogic.php
@@ -138,7 +138,7 @@ class ManageCompanyLogic extends BaseLogic
      */
     public static function delete(array $params): bool
     {
-		$contact = ManageCompanyContacts::where('company_id',$params['id'])->findOrEmpty();
+		$contact = ManageCompanyContacts::where('company_id','in',$params['id'])->findOrEmpty();
 		if(!$contact->isEmpty()){
 			self::setError('该数据下存在联系人信息,须删除联系人信息');
 			return false;
diff --git a/app/adminapi/logic/manage_basic/ManageProjectLogic.php b/app/adminapi/logic/manage_basic/ManageProjectLogic.php
index 783b7e35e..3d603e905 100644
--- a/app/adminapi/logic/manage_basic/ManageProjectLogic.php
+++ b/app/adminapi/logic/manage_basic/ManageProjectLogic.php
@@ -147,25 +147,25 @@ class ManageProjectLogic extends BaseLogic
     public static function delete(array $params): bool
     {
 		//获取参建单位
-	    $company = ManageCompany::where('project_id',$params['id'])->findOrEmpty();
+	    $company = ManageCompany::where('project_id','in',$params['id'])->findOrEmpty();
 		if(!$company->isEmpty()){
 			self::setError('该数据下存在参建单位信息,须删除参建单位信息');
 			return false;
 		}
 		//获取计量支付信息
-	    $metered_payment = ManageMeteredPayment::where('project_id',$params['id'])->findOrEmpty();
+	    $metered_payment = ManageMeteredPayment::where('project_id','in',$params['id'])->findOrEmpty();
 	    if(!$metered_payment->isEmpty()){
 		    self::setError('该数据下存在计量支付信息,须删除计量支付信息');
 		    return false;
 	    }
 		//获取工程变更信息
-	    $engineering_changes = ManageEngineeringChanges::where('project_id',$params['id'])->findOrEmpty();
+	    $engineering_changes = ManageEngineeringChanges::where('project_id','in',$params['id'])->findOrEmpty();
 		if(!$engineering_changes->isEmpty()){
 			self::setError('该数据下存在工程变更信息,须删除工程变更信息');
 			return false;
 		}
 		//获取工程进度月报信息
-	    $progress_report = ManageMonthlyProgressReport::where('project_id',$params['id'])->findOrEmpty();
+	    $progress_report = ManageMonthlyProgressReport::where('project_id','in',$params['id'])->findOrEmpty();
 	    if(!$progress_report->isEmpty()){
 		    self::setError('该数据下存在进度月报信息,须删除进度月报信息');
 		    return false;
diff --git a/app/adminapi/validate/manage_basic/ManageProjectValidate.php b/app/adminapi/validate/manage_basic/ManageProjectValidate.php
index 7c2f7a86f..96888d035 100644
--- a/app/adminapi/validate/manage_basic/ManageProjectValidate.php
+++ b/app/adminapi/validate/manage_basic/ManageProjectValidate.php
@@ -188,13 +188,5 @@ class ManageProjectValidate extends BaseValidate
 		}
 		return true;
 	}
-	
-	public function checkAnnex($value): bool|string
-	{
-		if(!empty($value) && $value != '' && !is_array($value)){
-			return '附件格式错误';
-		}
-		return true;
-	}
 
 }
\ No newline at end of file
diff --git a/app/adminapi/validate/manage_communication/ManageAcceptDocValidate.php b/app/adminapi/validate/manage_communication/ManageAcceptDocValidate.php
index 16fd79475..ceae210f2 100644
--- a/app/adminapi/validate/manage_communication/ManageAcceptDocValidate.php
+++ b/app/adminapi/validate/manage_communication/ManageAcceptDocValidate.php
@@ -125,13 +125,5 @@ class ManageAcceptDocValidate extends BaseValidate
 		}
 		return true;
 	}
-	
-	public function checkAnnex($value): bool|string
-	{
-		if(!empty($value) && $value != '' && !is_array($value)){
-			return '附件格式错误';
-		}
-		return true;
-	}
 
 }
\ No newline at end of file
diff --git a/app/adminapi/validate/manage_communication/ManageInfoReportValidate.php b/app/adminapi/validate/manage_communication/ManageInfoReportValidate.php
index 5fa74b95a..86be338c2 100644
--- a/app/adminapi/validate/manage_communication/ManageInfoReportValidate.php
+++ b/app/adminapi/validate/manage_communication/ManageInfoReportValidate.php
@@ -148,13 +148,5 @@ class ManageInfoReportValidate extends BaseValidate
 		}
 		return true;
 	}
-	
-	public function checkAnnex($value): bool|string
-	{
-		if(!empty($value) && $value != '' && !is_array($value)){
-			return '附件格式错误';
-		}
-		return true;
-	}
 
 }
\ No newline at end of file
diff --git a/app/adminapi/validate/manage_communication/ManageSendDocValidate.php b/app/adminapi/validate/manage_communication/ManageSendDocValidate.php
index b91127ca5..fd00bccca 100644
--- a/app/adminapi/validate/manage_communication/ManageSendDocValidate.php
+++ b/app/adminapi/validate/manage_communication/ManageSendDocValidate.php
@@ -124,13 +124,5 @@ class ManageSendDocValidate extends BaseValidate
 		}
 		return true;
 	}
-	
-	public function checkAnnex($value): bool|string
-	{
-		if(!empty($value) && $value != '' && !is_array($value)){
-			return '附件格式错误';
-		}
-		return true;
-	}
 
 }
\ No newline at end of file
diff --git a/app/adminapi/validate/manage_invest/ManageEngineeringChangesValidate.php b/app/adminapi/validate/manage_invest/ManageEngineeringChangesValidate.php
index 2161a694f..55a1f687d 100644
--- a/app/adminapi/validate/manage_invest/ManageEngineeringChangesValidate.php
+++ b/app/adminapi/validate/manage_invest/ManageEngineeringChangesValidate.php
@@ -122,13 +122,5 @@ class ManageEngineeringChangesValidate extends BaseValidate
 		}
 		return true;
 	}
-	
-	public function checkAnnex($value): bool|string
-	{
-		if(!empty($value) && $value != '' && !is_array($value)){
-			return '附件格式错误';
-		}
-		return true;
-	}
 
 }
\ No newline at end of file
diff --git a/app/adminapi/validate/manage_progress/ManageMonthlyProgressReportValidate.php b/app/adminapi/validate/manage_progress/ManageMonthlyProgressReportValidate.php
index 24d64ece1..e877eb133 100644
--- a/app/adminapi/validate/manage_progress/ManageMonthlyProgressReportValidate.php
+++ b/app/adminapi/validate/manage_progress/ManageMonthlyProgressReportValidate.php
@@ -132,13 +132,5 @@ class ManageMonthlyProgressReportValidate extends BaseValidate
 		}
 		return true;
 	}
-	
-	public function checkAnnex($value): bool|string
-	{
-		if(!empty($value) && $value != '' && !is_array($value)){
-			return '附件格式错误';
-		}
-		return true;
-	}
 
 }
\ No newline at end of file
diff --git a/app/common/model/manage_basic/ManageProject.php b/app/common/model/manage_basic/ManageProject.php
index 8a0609200..4d3b782bc 100644
--- a/app/common/model/manage_basic/ManageProject.php
+++ b/app/common/model/manage_basic/ManageProject.php
@@ -81,8 +81,4 @@ class ManageProject 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
diff --git a/app/common/model/manage_communication/ManageAcceptDoc.php b/app/common/model/manage_communication/ManageAcceptDoc.php
index 956434ab6..d866b9d08 100644
--- a/app/common/model/manage_communication/ManageAcceptDoc.php
+++ b/app/common/model/manage_communication/ManageAcceptDoc.php
@@ -39,9 +39,4 @@ class ManageAcceptDoc 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
diff --git a/app/common/model/manage_communication/ManageInfoReport.php b/app/common/model/manage_communication/ManageInfoReport.php
index ef03fbe32..54155d543 100644
--- a/app/common/model/manage_communication/ManageInfoReport.php
+++ b/app/common/model/manage_communication/ManageInfoReport.php
@@ -31,10 +31,6 @@ class ManageInfoReport extends BaseModel
     protected $name = 'manage_info_report';
     protected $deleteTime = 'delete_time';
 	
-	public function getAnnexAttr($value){
-		return !empty($value) ? json_decode($value,true) : '';
-	}
-	
 	public function getInfoCateAttr($value){
 		return !empty($value) ? json_decode($value,true) : '';
 	}
diff --git a/app/common/model/manage_communication/ManageSendDoc.php b/app/common/model/manage_communication/ManageSendDoc.php
index 5ed671167..a2635c5dd 100644
--- a/app/common/model/manage_communication/ManageSendDoc.php
+++ b/app/common/model/manage_communication/ManageSendDoc.php
@@ -34,9 +34,4 @@ class ManageSendDoc 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
diff --git a/app/common/model/manage_invest/ManageEngineeringChanges.php b/app/common/model/manage_invest/ManageEngineeringChanges.php
index b8c00e15d..d05ed4426 100644
--- a/app/common/model/manage_invest/ManageEngineeringChanges.php
+++ b/app/common/model/manage_invest/ManageEngineeringChanges.php
@@ -34,9 +34,4 @@ class ManageEngineeringChanges 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
diff --git a/app/common/model/manage_progress/ManageMonthlyProgressReport.php b/app/common/model/manage_progress/ManageMonthlyProgressReport.php
index 038d3f4a9..f9f990a87 100644
--- a/app/common/model/manage_progress/ManageMonthlyProgressReport.php
+++ b/app/common/model/manage_progress/ManageMonthlyProgressReport.php
@@ -40,10 +40,5 @@ class ManageMonthlyProgressReport extends BaseModel
 	{
 		return !empty($value) ? date('Y-m', $value) : '';
 	}
-	
-	public function getAnnexAttr($value)
-	{
-		return !empty($value) ? json_decode($value,true) : '';
-	}
     
 }
\ No newline at end of file