From 5e9723b040e1b22b3d2cde18c174e21e59a70227 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Fri, 27 Nov 2020 10:50:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=B0=E5=A2=9E=E4=BB=85?=
 =?UTF-8?q?=E5=8D=95=E5=8F=82=E4=B8=8E=E7=BB=93=E7=AE=97=E6=98=AF=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompanyStatementSetController.class.php   | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php
index 37ffa7960..55cd1331c 100644
--- a/Application/Admin/Controller/CompanyStatementSetController.class.php
+++ b/Application/Admin/Controller/CompanyStatementSetController.class.php
@@ -952,14 +952,16 @@ class CompanyStatementSetController extends Controller {
 		$spenMap = [
 			"s.pay_status"=>1,
 			"s.payed_time"=>['between', [$begintime,$endtime]],
+			"s.is_check"=>1
+		];
+        $cpMap = [
+			"s.pay_status"=>1,
+			"s.payed_time"=>['between', [$begintime,$endtime]]
+		];
+		$cpAllMap =[
+			"s.pay_status"=>1,
+			"s.payed_time"=>['elt',$endtime]
 		];
-//        dump($spenMap);
-
-        $cpMap = $spenMap;
-        $cpMap["s.payed_time"] = ['between', [strtotime(date("Y-m-1",$begintime)),$endtime]];
-
-		$cpAllMap = $spenMap;
-        $cpAllMap["s.payed_time"] = ['elt',$endtime];
 
 		for ($i=0; $i <count($idarr); $i++) {
             $company_id = $idarr[$i];
@@ -1256,15 +1258,19 @@ class CompanyStatementSetController extends Controller {
 		$spenMap = [
 			"s.pay_status"=>1,
 			"s.payed_time"=>['between', [$begintime,$endtime]],
+			"s.is_check"=>1
 		];
         $cpallgame = [];
         $cpgame = [];
-        $cpMap = $spenMap;
-
-        $cpMap["s.payed_time"] = ['between', [strtotime(date("Y-m-1",$begintime)),$endtime]];
+        $cpMap = [
+			"s.pay_status"=>1,
+			"s.payed_time"=>['between', [$begintime,$endtime]]
+		];
 
-        $cpAllMap = $spenMap;
-        $cpAllMap["s.payed_time"] = ['elt',$endtime];
+        $cpAllMap = [
+			"s.pay_status"=>1,
+			"s.payed_time"=>['elt',$endtime]
+		];
 //        unset($cpAllMap["s.payed_time"]);
 
 		for ($i=0; $i <count($idarr); $i++) {
@@ -2130,6 +2136,7 @@ class CompanyStatementSetController extends Controller {
 		$spenMap = [
 			"s.pay_status"=>1,
 			"s.payed_time"=>['between', [$begintime,$endtime]],
+			"s.is_check"=>1
 		];
 
 		$company_id = $company_id;
@@ -2155,6 +2162,7 @@ class CompanyStatementSetController extends Controller {
 		$spenMap = [
 			"s.pay_status"=>1,
 			"s.payed_time"=>['between', [$begintime,$endtime]],
+			"s.is_check"=>1
 		];
 
 		$Pmap = [