From 819137054e57cf767763f3052bb6149544cff0cb Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 17 Jun 2020 10:14:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PaymentController.class.php | 42 ++++++++ Application/Payment/View/Payment/lists.html | 98 +++++++++++------- Public/static/laydate/laydate.js | 2 + .../laydate/theme/default/font/iconfont.eot | Bin 0 -> 2456 bytes .../laydate/theme/default/font/iconfont.svg | 45 ++++++++ .../laydate/theme/default/font/iconfont.ttf | Bin 0 -> 2272 bytes .../laydate/theme/default/font/iconfont.woff | Bin 0 -> 1492 bytes .../static/laydate/theme/default/laydate.css | 2 + 8 files changed, 149 insertions(+), 40 deletions(-) create mode 100644 Public/static/laydate/laydate.js create mode 100644 Public/static/laydate/theme/default/font/iconfont.eot create mode 100644 Public/static/laydate/theme/default/font/iconfont.svg create mode 100644 Public/static/laydate/theme/default/font/iconfont.ttf create mode 100644 Public/static/laydate/theme/default/font/iconfont.woff create mode 100644 Public/static/laydate/theme/default/laydate.css diff --git a/Application/Payment/Controller/PaymentController.class.php b/Application/Payment/Controller/PaymentController.class.php index da58a6c46..42c5e6838 100644 --- a/Application/Payment/Controller/PaymentController.class.php +++ b/Application/Payment/Controller/PaymentController.class.php @@ -32,6 +32,48 @@ class PaymentController extends BaseController $map=[ "i.verify_status"=>["in","-1,1"], ]; + + if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) { + $time_start = strtotime($_REQUEST['time_start']); + $time_end = strtotime($_REQUEST['time_end'])+ 86399; + $map["_string"] = "(i.statement_begin_time BETWEEN {$time_start} AND {$time_end}) OR (i.statement_end_time BETWEEN {$time_start} AND {$time_end})"; + } elseif (isset($_REQUEST['time_start'])) { + $time_start = strtotime($_REQUEST['time_start']); + $map["_string"] = "(i.statement_begin_time >= {$time_start} ) OR (i.statement_end_time >= {$time_start})"; + } elseif (isset($_REQUEST['time_end'])) { + $time_end = strtotime($_REQUEST['time_end'])+ 86399; + $map["_string"] = "(i.statement_begin_time <= {$time_end} ) OR (i.statement_end_time <= {$time_end})"; + } + + if (isset($_REQUEST['pay_time_start']) && isset($_REQUEST['pay_time_end'])) { + $map['i.pay_time'] = ['between', [strtotime($_REQUEST['pay_time_start']), strtotime($_REQUEST['pay_time_end']) + 86399]]; + } elseif (isset($_REQUEST['pay_time_start'])) { + $map['i.pay_time'] = ['EGT', strtotime($_REQUEST['pay_time_start'])]; + } elseif (isset($_REQUEST['pay_time_end'])) { + $map['i.pay_time'] = ['ELT', strtotime($_REQUEST['pay_time_end']) + 86399]; + } + + if(isset($_REQUEST['company_type'])){ + $map['i.company_type'] = $_REQUEST['company_type']; + } + if(isset($_REQUEST['company_id'])){ + $map['i.company_id'] = $_REQUEST['company_id']; + } + + if(isset($_REQUEST['pay_status'])){ + if($_REQUEST['pay_status'] == -2){ + $map['i.verify_status'] = -1; + }else{ + $map['i.pay_status'] = $_REQUEST['pay_status']; + } + } + + if(isset($_REQUEST['pay_type'])){ + $map['i.pay_type'] = $_REQUEST['pay_type']; + } + + + $CompanyInfo = M("company_statement_info","tab_") ->alias('i') ->field("i.*,p.statement_num statement_pool_num") diff --git a/Application/Payment/View/Payment/lists.html b/Application/Payment/View/Payment/lists.html index ce23f9460..05891e5cb 100644 --- a/Application/Payment/View/Payment/lists.html +++ b/Application/Payment/View/Payment/lists.html @@ -97,7 +97,7 @@ @@ -116,7 +116,7 @@
-
@@ -125,8 +125,8 @@
 -  -
- +
+
@@ -143,17 +143,17 @@
- +  -  -
- +
+
@@ -204,7 +204,7 @@ - + {$data.company_name} {$data.company_type} {$data.valid} @@ -251,9 +251,8 @@ '; - - + +