From eb484d10ac77c3aed6d7ee68434374e040a5f198 Mon Sep 17 00:00:00 2001
From: weiz <weiz@lihai.com>
Date: Mon, 15 Jan 2024 13:55:16 +0800
Subject: [PATCH] update

---
 .../CustomerDemandSolutionController.php      |  1 +
 ...nanceRefundInvoiceDifferenceController.php | 46 +++++++++++++++++++
 .../custom/CustomerDemandSolutionValidate.php |  2 +-
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 app/adminapi/controller/finance/FinanceRefundInvoiceDifferenceController.php

diff --git a/app/adminapi/controller/custom/CustomerDemandSolutionController.php b/app/adminapi/controller/custom/CustomerDemandSolutionController.php
index 7daaa1d27..9af017a03 100644
--- a/app/adminapi/controller/custom/CustomerDemandSolutionController.php
+++ b/app/adminapi/controller/custom/CustomerDemandSolutionController.php
@@ -52,6 +52,7 @@ class CustomerDemandSolutionController extends BaseAdminController
     public function add()
     {
         $params = (new CustomerDemandSolutionValidate())->post()->goCheck('add');
+	    halt($params);
         $result = CustomerDemandSolutionLogic::add($params,$this->adminId);
         if (true === $result) {
             return $this->success('添加成功', [], 1, 1);
diff --git a/app/adminapi/controller/finance/FinanceRefundInvoiceDifferenceController.php b/app/adminapi/controller/finance/FinanceRefundInvoiceDifferenceController.php
new file mode 100644
index 000000000..0eca0ba5a
--- /dev/null
+++ b/app/adminapi/controller/finance/FinanceRefundInvoiceDifferenceController.php
@@ -0,0 +1,46 @@
+<?php
+	
+	namespace app\adminapi\controller\finance;
+	
+	use app\adminapi\controller\BaseAdminController;
+	use app\common\model\contract\Contract;
+	use app\common\model\contract\ContractNegotiation;
+	use app\common\model\custom\Custom;
+	use app\common\model\finance\FinanceInvoiceApply;
+	use app\common\model\finance\FinanceReturnedRecord;
+	use app\common\model\project\Project;
+	
+	class FinanceRefundInvoiceDifferenceController extends BaseAdminController
+	{
+		public function lists() {
+			$params = $this->request->get(['page_no','page_size']);
+			$pageNo = empty($params['page_no']) ? 1 : $params['page_no'];
+			$pageSize = empty($params['page_size']) ? 15 : $params['page_size'];
+			$where = [];
+			$data = Contract::field('id,project_id,contract_code,contract_name,contract_date,amount')->where($where)
+				->page($pageNo,$pageSize)
+				->order(['id' => 'desc'])
+				->select()->each(function($item){
+					$project = Project::field('custom_id,name,project_code')->where('id',$item['project_id'])->findOrEmpty();
+					$custom = Custom::field('name')->where('id',$project['custom_id'])->findOrEmpty();
+					$item['project_name'] = $project['name'];
+					$item['project_code'] = $project['project_code'];
+					$item['custom_name'] = $custom['name'];
+					//合同洽商金额
+					$negotiate_amount = ContractNegotiation::where('contract_id',$item['id'])->sum('negotiation_amount');
+					//合同实际金额
+					$item['contract_amount'] = $item['amount'] + $negotiate_amount;
+					//已回款金额
+					$item['has_refund_amount'] = FinanceReturnedRecord::where('contract_id',$item['id'])->sum('amount');
+					//已开票金额
+					$item['has_invoice_amount'] = FinanceInvoiceApply::where('contract_id',$item['id'])->sum('invoicing_amount');
+					//开票未回款
+					$item['has_invoice_not_refund_amount'] = ($item['has_invoice_amount'] - $item['has_refund_amount']) <= 0 ? 0 : $item['has_invoice_amount'] - $item['has_refund_amount'];
+					//回款未开票
+					$item['has_refund_not_invoice_amount'] = ($item['has_refund_amount'] - $item['has_invoice_amount']) <= 0 ? 0 : $item['has_refund_amount'] - $item['has_invoice_amount'];
+					unset($item['amount']);
+					return $item;
+				})->toArray();
+			halt($data);
+		}
+	}
\ No newline at end of file
diff --git a/app/adminapi/validate/custom/CustomerDemandSolutionValidate.php b/app/adminapi/validate/custom/CustomerDemandSolutionValidate.php
index 6792fa667..e905d1936 100644
--- a/app/adminapi/validate/custom/CustomerDemandSolutionValidate.php
+++ b/app/adminapi/validate/custom/CustomerDemandSolutionValidate.php
@@ -146,7 +146,7 @@ class CustomerDemandSolutionValidate extends BaseValidate
 	
 	public function checkAnnex($value): bool|string
 	{
-		if(!empty($value) && $value != '' && $value != '[]'){
+		if(!empty($value) && $value != ''){
 			$annex = $value;//json_decode($value,true);
 			if(empty($annex) || !is_array($annex)){
 				return '附件格式错误';