elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/604
master
廖金灵 3 years ago
parent c3b0a426a7 2ff8934302
commit f8defccc9c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
Application/Admin/Controller/CompanyStatementSetController.class.php
Unescape Escape View File

@ -2100,7 +2100,7 @@ class CompanyStatementSetController extends Controller {
{ {
$begintime = strtotime(str_replace('.','-',$begintime)); $begintime = strtotime(str_replace('.','-',$begintime));
$endtime = strtotime(str_replace('.','-',$endtime))+86499; $endtime = strtotime(str_replace('.','-',$endtime))+86399;
//获取所有公司的奖罚 //获取所有公司的奖罚
$rrmap = array( $rrmap = array(
@ -2149,7 +2149,7 @@ class CompanyStatementSetController extends Controller {
{ {
$begintime = strtotime(str_replace('.','-',$begintime)); $begintime = strtotime(str_replace('.','-',$begintime));
$endtime = strtotime(str_replace('.','-',$endtime))+86499; $endtime = strtotime(str_replace('.','-',$endtime))+86399;
//获取所有公司的奖罚 //获取所有公司的奖罚
$rrmap = array( $rrmap = array(

Write Preview
Loading…
Cancel
Save