From 47b54d336ca8def952dc0e16f231a7d02d885fdc Mon Sep 17 00:00:00 2001 From: chenzhi <294767167@11qq.com> Date: Sun, 26 Jul 2020 10:54:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E6=92=A4=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/CompanyStatementPoolController.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index c9d1e4b49..6fd12b821 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -839,10 +839,10 @@ class CompanyStatementPoolController extends ThinkController $st_res = M("company_statement","tab_")->field("id,verify_status,verify_log")->where("id in ({$sids})")->select(); foreach($st_res as $k=>&$v){ $v['verify_log'] = json_decode($v['verify_log'],true); - $v['verify_log'][$op_pre.'_user']=$this->admininfo["username"]; - $v['verify_log'][$op_pre.'_time']=date("Y-m-d H:i:s"); + $v['verify_log']['pool_user']=$this->admininfo["username"]; + $v['verify_log']['pool_time']=date("Y-m-d H:i:s"); $v['verify_log'] = json_encode($v['verify_log']); - $v['verify_status']=-2; + $v['verify_status']=-3; $stres = M("company_statement","tab_")->save($v); if($stres === false){ M()->rollback(); From eb311348a8ed36a3371150a0b12b32ab796c965e Mon Sep 17 00:00:00 2001 From: chenzhi <294767167@11qq.com> Date: Sun, 26 Jul 2020 11:31:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/CompanyStatementController.class.php | 4 ++++ .../CompanyStatementLackController.class.php | 10 ++++++---- .../CompanyStatementPoolController.class.php | 9 +++++---- Application/Admin/View/CompanyStatement/lists.html | 7 +++++-- .../Admin/View/CompanyStatementLack/lists.html | 12 +++++------- .../Admin/View/CompanyStatementPool/lists.html | 2 +- .../Admin/View/CompanyStatementPool/viewPuPool.html | 2 +- 7 files changed, 27 insertions(+), 19 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index a1fbdf569..86910049f 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -111,9 +111,13 @@ class CompanyStatementController extends ThinkController if(isset($_REQUEST['company_belong'])){ $map['company_belong'] = $_REQUEST['company_belong']; } + if(isset($_REQUEST['company_id'])){ $map['company_id'] = $_REQUEST['company_id']; } + if(isset($_REQUEST['company_name'])){ + $map['company_name'] =["LIKE","%{$_REQUEST['company_name']}%"]; + } if(isset($_REQUEST['verify_status'])){ $map['verify_status'] = $_REQUEST['verify_status']; } diff --git a/Application/Admin/Controller/CompanyStatementLackController.class.php b/Application/Admin/Controller/CompanyStatementLackController.class.php index 6e5d63cc3..658649fb7 100644 --- a/Application/Admin/Controller/CompanyStatementLackController.class.php +++ b/Application/Admin/Controller/CompanyStatementLackController.class.php @@ -41,7 +41,7 @@ class CompanyStatementLackController extends ThinkController if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) { $time_start = strtotime($_REQUEST['time_start']); $time_end = strtotime($_REQUEST['time_end'])+ 86399; - $map["_string"] = "(statement_begin_time BETWEEN {$time_start} AND {$time_end}) OR (statement_end_time BETWEEN {$time_start} AND {$time_end})"; + $map["_string"] = "(statement_begin_time BETWEEN {$time_start} AND {$time_end}) OR (statement_end_time BETWEEN {$time_start} AND {$time_end}) OR (statement_begin_time <= {$time_end} AND statement_end_time >= {$time_end})"; } elseif (isset($_REQUEST['time_start'])) { $time_start = strtotime($_REQUEST['time_start']); $map["_string"] = "(statement_begin_time >= {$time_start} ) OR (statement_end_time >= {$time_start})"; @@ -54,10 +54,12 @@ class CompanyStatementLackController extends ThinkController if(isset($_REQUEST['company_type'])){ $map['company_type'] = $_REQUEST['company_type']; } - if(isset($_REQUEST['company_id'])){ - $map['company_id'] = $_REQUEST['company_id']; + if(isset($_REQUEST['company_name'])){ + $map['company_name'] =["LIKE","%{$_REQUEST['company_id']}%"]; + } + if(isset($_REQUEST['statement_pool_num'])){ + $map['statement_pool_num'] =["LIKE","%{$_REQUEST['statement_pool_num']}%"]; } - if(isset($_REQUEST['is_payment'])){ $map['is_payment'] = $_REQUEST['is_payment']; } diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index 6fd12b821..c571ca565 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -67,7 +67,7 @@ class CompanyStatementPoolController extends ThinkController if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) { $time_start = strtotime($_REQUEST['time_start']); $time_end = strtotime($_REQUEST['time_end'])+ 86399; - $map["_string"] = "(statement_begin_time BETWEEN {$time_start} AND {$time_end}) OR (statement_end_time BETWEEN {$time_start} AND {$time_end})"; + $map["_string"] = "(statement_begin_time BETWEEN {$time_start} AND {$time_end}) OR (statement_end_time BETWEEN {$time_start} AND {$time_end}) OR (statement_begin_time <= {$time_end} AND statement_end_time >= {$time_end})"; } elseif (isset($_REQUEST['time_start'])) { $time_start = strtotime($_REQUEST['time_start']); $map["_string"] = "(statement_begin_time >= {$time_start} ) OR (statement_end_time >= {$time_start})"; @@ -206,10 +206,10 @@ class CompanyStatementPoolController extends ThinkController //获取基本信息 $infolist = M("company_statement_info","tab_")->field("*,'1' as st")->where("pool_id = '{$id}'")->select(); //获取母单 - $statement_num = - $pool_info = M("company_statement_pool","tab_")->field('statement_num,create_lack_ids')->where("id={$id}")->find(); + $pool_info = M("company_statement_pool","tab_")->field('statement_num,create_lack_ids,verify_status')->where("id={$id}")->find(); $statement_num = $pool_info['statement_num']; $this->assign("title",$statement_num); + $this->assign("pool_status",$pool_info['verify_status']); if($infolist[0]['company_type'] == 3){ //上游 @@ -694,7 +694,8 @@ class CompanyStatementPoolController extends ThinkController 'fine'=>$pool['fine']-$v['fine'], 'reward'=>$pool['reward']-$v['reward'], 'lack_statement_money'=>$pool['lack_statement_money']+$v['statement_money'], - 'lack_platform_amount'=>$pool['lack_platform_amount']-0+$v['platform_amount'] + 'lack_platform_amount'=>$pool['lack_platform_amount']-0+$v['platform_amount'], + 'verify_status'=>0 ]; // if(empty($pool_data['create_lack_ids'])){ diff --git a/Application/Admin/View/CompanyStatement/lists.html b/Application/Admin/View/CompanyStatement/lists.html index f4972427c..df57735d3 100644 --- a/Application/Admin/View/CompanyStatement/lists.html +++ b/Application/Admin/View/CompanyStatement/lists.html @@ -98,11 +98,14 @@ -
+
+   +
+
-
- +
+  
- - - +
+   +
diff --git a/Application/Admin/View/CompanyStatementPool/lists.html b/Application/Admin/View/CompanyStatementPool/lists.html index d40073fee..45515d5dc 100644 --- a/Application/Admin/View/CompanyStatementPool/lists.html +++ b/Application/Admin/View/CompanyStatementPool/lists.html @@ -290,7 +290,7 @@ title: "海南万盟天下科技有限公司", shadeClose: true, shade: 0.8, - area: ['70%', '80%'], + area: ['100%', '100%'], content: url }); }); diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool.html b/Application/Admin/View/CompanyStatementPool/viewPuPool.html index f038e2ba6..170d488a1 100644 --- a/Application/Admin/View/CompanyStatementPool/viewPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewPuPool.html @@ -160,7 +160,7 @@ 否 是 - + 不结算 From b7409ab069ea0ffc0a09934f42ad90b1b8cf240c Mon Sep 17 00:00:00 2001 From: chenzhi <294767167@11qq.com> Date: Sun, 26 Jul 2020 11:47:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementPoolController.class.php | 9 +++++++-- .../Admin/View/CompanyStatementLack/lists.html | 2 +- .../View/CompanyStatementPool/viewPuPool.html | 17 +++++++++-------- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index c571ca565..26fd97950 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -274,8 +274,13 @@ class CompanyStatementPoolController extends ThinkController } if($is_export){ - $count["platform_amount"] = "=".trim($count["platform_amount_exp"],"+"); - $count["sum_money"] = "=".trim($count["sum_money_exp"],"+"); + $platform_amount_exp = trim($count["platform_amount_exp"],"+"); + $sum_money_exp = trim($count["sum_money_exp"],"+"); + if(empty($platform_amount_exp)){ $platform_amount_exp = 0;} + if(empty($sum_money_exp)){ $sum_money_exp = 0;} + + $count["platform_amount"] = "=".$platform_amount_exp; + $count["sum_money"] = "=".$sum_money_exp; } $this->assign("data",$infolist); $this->assign("count",$count); diff --git a/Application/Admin/View/CompanyStatementLack/lists.html b/Application/Admin/View/CompanyStatementLack/lists.html index fec93221a..edfbe4676 100644 --- a/Application/Admin/View/CompanyStatementLack/lists.html +++ b/Application/Admin/View/CompanyStatementLack/lists.html @@ -272,7 +272,7 @@ title: "海南万盟天下科技有限公司", shadeClose: true, shade: 0.8, - area: ['70%', '80%'], + area: ['100%', '100%'], content: url }); }); diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool.html b/Application/Admin/View/CompanyStatementPool/viewPuPool.html index 170d488a1..ff2734b8b 100644 --- a/Application/Admin/View/CompanyStatementPool/viewPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewPuPool.html @@ -116,9 +116,8 @@ 开户支行 帐户类型 备注 - - 是否结算 - + 是否结算 + 操作 @@ -126,7 +125,7 @@ - style='color:red;'> + {$key-0+1} {$com.company_name} @@ -156,9 +155,8 @@ {$com.company_info.opening_bank} {$com.remark} - - 否 是 - + 否 是 + 不结算 @@ -172,7 +170,7 @@ - style='color:red;'> + {$it['game_name']} {$it['game_type_name']} {$it['statement_begin_time']} ~ {$it['statement_end_time']} @@ -209,6 +207,9 @@ + + +