From 0a136fbbde4df72574945b5ffe306b103ac4db91 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Thu, 13 Aug 2020 09:54:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E7=AE=97=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompanyStatementController.class.php      | 20 +++++++++----------
 .../CompanyStatementLackController.class.php  |  8 ++++----
 .../CompanyStatementPoolController.class.php  | 14 ++++++-------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php
index 0239a76e0..98f1e5cf5 100644
--- a/Application/Admin/Controller/CompanyStatementController.class.php
+++ b/Application/Admin/Controller/CompanyStatementController.class.php
@@ -132,12 +132,12 @@ class CompanyStatementController extends ThinkController
             ->order("FIELD(verify_status,0,1,-1,2,3,-2,-3),id desc")->page($page,$row)->select();
         foreach($data as $k => &$v) {
 
-            $v['statement_begin_time'] = date('Y-m-d',$v['statement_begin_time']);
-            $v['statement_end_time'] = date('Y-m-d',$v['statement_end_time']);
+            $v['statement_begin_time'] = date('Y.m.d',$v['statement_begin_time']);
+            $v['statement_end_time'] = date('Y.m.d',$v['statement_end_time']);
 
             $v['company_belong'] = $this->CompanyBelong[$v['company_belong']];
-            $v['op_time'] = date('Y-m-d H:i:s',$v['op_time']);
-            $v["valid"] = "{$v['statement_begin_time']} ~ {$v['statement_end_time']}";
+            $v['op_time'] = date('Y.m.d H:i:s',$v['op_time']);
+            $v["valid"] = "{$v['statement_begin_time']}-{$v['statement_end_time']}";
 
 
             $v['withdraw_type_1'] = ($v['withdraw_type'] == 1 ? "月结" :"周结");
@@ -282,7 +282,7 @@ class CompanyStatementController extends ThinkController
             $y = M("CompanyStatement", "tab_")->where("id='{$params['id']}'")->find();
             if($y['first_party_info'] != $params['first_party_info'] || $y['second_party_info'] != $params['second_party_info'] || $y['statement_info'] != $params['statement_info']){
                 $params['verify_status'] = 0;
-                $params['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]);
+                $params['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y.m.d H:i:s")]);
                 $params['op_time'] = time();
                 M("CompanyStatement","tab_")->save($params);
             }
@@ -342,7 +342,7 @@ class CompanyStatementController extends ThinkController
             if($v['confirm_status'] != 0) continue;
             $v['confirm_log'] = json_decode($v['confirm_log'],true);
             $v['confirm_log']['launch_user']=$this->admininfo["username"];
-            $v['confirm_log']['launch_time']=date("Y-m-d H:i:s");
+            $v['confirm_log']['launch_time']=date("Y.m.d H:i:s");
             $v['confirm_log'] = json_encode($v['confirm_log']);
             $v['confirm_status']=1;
             // $v['op_time'] = time();
@@ -364,7 +364,7 @@ class CompanyStatementController extends ThinkController
             if($v['verify_status'] != $old_status) continue;
             $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'][$op_pre.'_time']=date("Y.m.d H:i:s");
             $v['verify_log'] = json_encode($v['verify_log']);
             $v['verify_status']=$change_status;
             $v['op_time'] = time();
@@ -484,7 +484,7 @@ class CompanyStatementController extends ThinkController
             "fine"=>0,
             "reward"=>0,
             "verify_status"=>0,
-            "verify_log"=>json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]),
+            "verify_log"=>json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y.m.d H:i:s")]),
             "op_time"=>time(),
             "company_list"=>[]
         ];
@@ -534,7 +534,7 @@ class CompanyStatementController extends ThinkController
 
             if($v['statement_money'] == 0){
                 $v['verify_status'] = 5;
-                $v['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s"),"verify_user"=>"system","verify_time"=>date("Y-m-d H:i:s"),"payment_user"=>"system","payment_time"=>date("Y-m-d H:i:s")]);
+                $v['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y.m.d H:i:s"),"verify_user"=>"system","verify_time"=>date("Y.m.d H:i:s"),"payment_user"=>"system","payment_time"=>date("Y.m.d H:i:s")]);
             }
             //判断周月结
             if(($v["statement_end_time"]-$v['statement_begin_time']) > 7*24*3600){
@@ -568,7 +568,7 @@ class CompanyStatementController extends ThinkController
             if($v['verify_status'] != $old_status) continue;
             $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'][$op_pre.'_time']=date("Y.m.d H:i:s");
             $v['verify_log'][$op_pre.'_num']=$num;
             $v['verify_log'] = json_encode($v['verify_log']);
             $v['verify_status']=$change_status;
diff --git a/Application/Admin/Controller/CompanyStatementLackController.class.php b/Application/Admin/Controller/CompanyStatementLackController.class.php
index 2403610c6..46ada8f23 100644
--- a/Application/Admin/Controller/CompanyStatementLackController.class.php
+++ b/Application/Admin/Controller/CompanyStatementLackController.class.php
@@ -75,11 +75,11 @@ class CompanyStatementLackController extends ThinkController
        
         foreach($data as $k => &$v) {
 
-            $v['statement_begin_time'] = date('Y-m-d',$v['statement_begin_time']);
-            $v['statement_end_time'] = date('Y-m-d',$v['statement_end_time']);
+            $v['statement_begin_time'] = date('Y.m.d',$v['statement_begin_time']);
+            $v['statement_end_time'] = date('Y.m.d',$v['statement_end_time']);
             $v['is_payment_str'] = $this->IsPayment[$v['is_payment']];
             $v['company_type_str'] = $this->CompanyType[$v['company_type']];
-            $v["valid"] = "{$v['statement_begin_time']} ~ {$v['statement_end_time']}";
+            $v["valid"] = "{$v['statement_begin_time']}-{$v['statement_end_time']}";
             $v['oplist'] = $this->OpAuth($v);
         }
         
@@ -146,7 +146,7 @@ class CompanyStatementLackController extends ThinkController
             "fine"=>0,
             "reward"=>0,
             "verify_status"=>0,
-            "verify_log"=>json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]),
+            "verify_log"=>json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y.m.d H:i:s")]),
             "op_time"=>time(),
             "company_list"=>[]
         ];
diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php
index e78d86d9f..b4d3a5fe9 100644
--- a/Application/Admin/Controller/CompanyStatementPoolController.class.php
+++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php
@@ -113,8 +113,8 @@ class CompanyStatementPoolController extends ThinkController
             ->page($page,$row)->select();
         foreach($data as $k => &$v) {
 
-            $v['statement_begin_time'] = date('Y-m-d',$v['statement_begin_time']);
-            $v['statement_end_time'] = date('Y-m-d',$v['statement_end_time']);
+            $v['statement_begin_time'] = date('Y.m.d',$v['statement_begin_time']);
+            $v['statement_end_time'] = date('Y.m.d',$v['statement_end_time']);
 
             $v['company_type_str'] = $this->CompanyType[$v['company_type']];
             $v['is_payment_str'] = $this->IsPayment[$v['is_payment']];
@@ -123,8 +123,8 @@ class CompanyStatementPoolController extends ThinkController
                 $v['can_export'] = 1;
             }
 
-            $v['op_time'] = date('Y-m-d H:i:s',$v['op_time']);
-            $v["valid"] = "{$v['statement_begin_time']} ~ {$v['statement_end_time']}";
+            $v['op_time'] = date('Y.m.d H:i:s',$v['op_time']);
+            $v["valid"] = "{$v['statement_begin_time']}-{$v['statement_end_time']}";
 
             $v['ext_file_type'] = empty($v['ext_file']) ? "无" : "有";
             $v['withdraw_type'] = $this->WithdrawType[$v['withdraw_type']];;
@@ -465,7 +465,7 @@ class CompanyStatementPoolController extends ThinkController
             if($v['verify_status'] != $old_status) continue;
             $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'][$op_pre.'_time']=date("Y.m.d H:i:s");
             $v['verify_log'] = json_encode($v['verify_log']);
             $v['verify_status']=$change_status;
             $this->DBModel->save($v);
@@ -483,7 +483,7 @@ class CompanyStatementPoolController extends ThinkController
         $dbres = $this->DBModel->field("id,verify_status,verify_log")->where("id = {$id}")->find();
         $dbres['verify_log'] = json_decode($dbres['verify_log'],true);
         $dbres['verify_log'][$op_pre.'_user']=$this->admininfo["username"];
-        $dbres['verify_log'][$op_pre.'_time']=date("Y-m-d H:i:s");
+        $dbres['verify_log'][$op_pre.'_time']=date("Y.m.d H:i:s");
         $dbres['verify_log'] = json_encode($dbres['verify_log']);
         $dbres['verify_status']=$change_status;
         $this->DBModel->save($dbres);
@@ -854,7 +854,7 @@ class CompanyStatementPoolController extends ThinkController
         foreach($st_res as $k=>&$v){
             $v['verify_log'] = json_decode($v['verify_log'],true);
             $v['verify_log']['pool_user']=$this->admininfo["username"];
-            $v['verify_log']['pool_time']=date("Y-m-d H:i:s");
+            $v['verify_log']['pool_time']=date("Y.m.d H:i:s");
             $v['verify_log'] = json_encode($v['verify_log']);
             $v['verify_status']=-3;
             $stres =  M("company_statement","tab_")->save($v);