|
|
@@ -503,11 +503,11 @@ class FinanceRepository extends BaseRepository
|
|
503
|
503
|
$lastMonday->setISODate($year, $week - 1, 1);
|
|
504
|
504
|
|
|
505
|
505
|
//上周时间条件
|
|
506
|
|
- $sWeekWhere .= " and DATE(create_time) >= '" . $lastMonday->format('Y-m-d') . "' and DATE(create_time) < '" . $thisMonday->format('Y-m-d') . "'";
|
|
|
506
|
+ $sWeekWhere .= " and DATE(take_time) >= '" . $lastMonday->format('Y-m-d') . "' and DATE(take_time) < '" . $thisMonday->format('Y-m-d') . "'";
|
|
507
|
507
|
//周时间条件
|
|
508
|
|
- $weekWhere .= " and DATE(create_time) >= '" . $thisMonday->format('Y-m-d') . "' and DATE(create_time) < '" . $nextMonday->format('Y-m-d') . "'";
|
|
|
508
|
+ $weekWhere .= " and DATE(take_time) >= '" . $thisMonday->format('Y-m-d') . "' and DATE(take_time) < '" . $nextMonday->format('Y-m-d') . "'";
|
|
509
|
509
|
//今日时间条件
|
|
510
|
|
- $dayWhere .= " and DATE(create_time) = '" . $todayFormatted . "'";
|
|
|
510
|
+ $dayWhere .= " and DATE(take_time) = '" . $todayFormatted . "'";
|
|
511
|
511
|
|
|
512
|
512
|
// 测试账号
|
|
513
|
513
|
$testUids = Db::name('user')->where('test_user', '1')->column('uid');
|