shish 2 years ago
parent
commit
c4b1ba68a1
2 changed files with 9 additions and 0 deletions
  1. 1 0
      app-ghs/controllers/StatCgController.php
  2. 8 0
      biz-ghs/stat/classes/StatCgClass.php

+ 1 - 0
app-ghs/controllers/StatCgController.php

@@ -20,6 +20,7 @@ class StatCgController extends BaseController
             util::fail('无法查看');
         }
         $mainId = $this->mainId;
+
         $list = StatCgClass::statCg($mainId);
         util::success(['list' => $list]);
     }

+ 8 - 0
biz-ghs/stat/classes/StatCgClass.php

@@ -5,6 +5,7 @@ namespace bizGhs\stat\classes;
 use bizGhs\order\classes\PurchaseOrderClass;
 use bizGhs\order\classes\PurchaseOrderItemClass;
 use bizGhs\product\classes\ProductClass;
+use common\components\arrayUtil;
 use common\components\dateUtil;
 use Yii;
 use bizGhs\base\classes\BaseClass;
@@ -31,6 +32,12 @@ class StatCgClass extends BaseClass
         $currentStartTime = $currentStartDate . ' 00:00:00';
         $currentEndTime = $currentEndDate . ' 23:59:59';
 
+        $sort = $get['sort'] ?? 'num';
+        $rank = 'num';
+        if ($sort == 'amount') {
+            $rank = 'amount';
+        }
+
         $productInfo = ProductClass::getAllByCondition(['mainId' => $mainId], null, 'id,name,py', 'id');
 
         $cgWhere = ['mainId' => $mainId, 'status' => 4];
@@ -66,6 +73,7 @@ class StatCgClass extends BaseClass
         }
         if (!empty($arr)) {
             $arr = array_values($arr);
+            $arr = arrayUtil::arraySort($arr, $rank);
         }
         return $arr;
     }