Merge branch 'master' of http://18.167.157.193:1026/guanli/ngds into feature/1940-theo-lastemp

common/models/Order.php

@@ -141,19 +141,13 @@ class Order extends \common\components\ActiveRecord
     public static function fetchOrderCurrentMonth($periodNum, $userId){
         $currentPeriod = Period::findOneAsArray("PERIOD_NUM = :PERIOD_NUM", [':PERIOD_NUM' => $periodNum]);
 
-        switch ($currentPeriod['WEEK_NUMBER']){
+        switch ($currentPeriod['CALC_WEEKEND']){
             case 1:
                 $periods = [$periodNum];
                 break;
             case 2:
                 $periods = [$periodNum-1, $periodNum];
                 break;
-            case 3:
-                $periods = [$periodNum-2, $periodNum-1, $periodNum];
-                break;
-            case 4:
-                $periods = [$periodNum-3, $periodNum-2, $periodNum-1, $periodNum];
-                break;
         }
 
         $periodsStr = implode(",", $periods);