0402需求变动

app/api/controller/Norm.php

@@ -39,15 +39,15 @@ class Norm
                     $normExtendBus = new CommonBus('NormExtendBus');
                     $res = $normExtendBus->getConditionalQueryAll(['norm_id'=>$value['id']]);
                     $result[$index]['custom']=$res;
-                    // 领取进度
-                    $NormListBus = new CommonBus('NormListBus'); // 通过公共业务初始化指标类
-                    $totalDegree = $NormListBus->getConditionalQueryAll(['norm_id'=>$value['id']]);
-                    $NormReceivesBus = new CommonBus('NormReceivesBus'); // 通过公共业务初始化指标类
-                    $receivedTimes = $NormReceivesBus->getConditionalQueryAll(['norm_id'=>$value['id']]);
-                    $result['data'][$index]['receivedQuantity']=count($receivedTimes).'/'.count($totalDegree)*$normRes['num'];
-                    $NormCollectsBus = new CommonBus('NormCollectsBus'); // 通过公共业务初始化指标类
-                    $collectsTimes = $NormCollectsBus->getConditionalQueryAll(['norm_id'=>$value['id']]);
-                    $result['data'][$index]['collectsQuantity']=count($collectsTimes).'/'.count($totalDegree)*$normRes['num'];
+//                    // 领取进度
+//                    $NormListBus = new CommonBus('NormListBus'); // 通过公共业务初始化指标类
+//                    $totalDegree = $NormListBus->getConditionalQueryAll(['norm_id'=>$value['id']]);
+//                    $NormReceivesBus = new CommonBus('NormReceivesBus'); // 通过公共业务初始化指标类
+//                    $receivedTimes = $NormReceivesBus->getConditionalQueryAll(['norm_id'=>$value['id']]);
+//                    $result['data']['receivedQuantity']=count($receivedTimes).'/'.count($totalDegree)*$normRes['num'];
+//                    $NormCollectsBus = new CommonBus('NormCollectsBus'); // 通过公共业务初始化指标类
+//                    $collectsTimes = $NormCollectsBus->getConditionalQueryAll(['norm_id'=>$value['id']]);
+//                    $result['data']['collectsQuantity']=count($collectsTimes).'/'.count($totalDegree)*$normRes['num'];
                 }
             }else{
                 //查询全部数据

app/api/controller/NormReceives.php

@@ -27,7 +27,6 @@ class NormReceives extends AuthBase
             $data['status'] = input("param.status");
             $data['user_id'] = input("param.user_id");
             $data['order'] = input("param.order")?input("param.order"):'desc';
-
 //            $data['user_id'] = $this->userId;
             $data['admin'] = input("param.admin")?input("param.admin"):0;
             if($data['admin'] == 0){