Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item_others

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 = [