Merge pull request '优化结算bug' (#604) from hotfix/change_cw into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/604
3 years ago · f8defccc9c
parent c3b0a426a7 2ff8934302
commit f8defccc9c
1 changed files with 2 additions and 2 deletions
--- a/Application/Admin/Controller/CompanyStatementSetController.class.php
+++ b/Application/Admin/Controller/CompanyStatementSetController.class.php
@ -2100,7 +2100,7 @@ class CompanyStatementSetController extends Controller {
    {

        $begintime = strtotime(str_replace('.','-',$begintime));
-        $endtime = strtotime(str_replace('.','-',$endtime))+86499;
+        $endtime = strtotime(str_replace('.','-',$endtime))+86399;

        //获取所有公司的奖罚
        $rrmap = array(
@ -2149,7 +2149,7 @@ class CompanyStatementSetController extends Controller {
    {

        $begintime = strtotime(str_replace('.','-',$begintime));
-        $endtime = strtotime(str_replace('.','-',$endtime))+86499;
+        $endtime = strtotime(str_replace('.','-',$endtime))+86399;

        //获取所有公司的奖罚
        $rrmap = array(