0402需求变动

app/api/business/NormListBus.php

@@ -34,6 +34,9 @@ class NormListBus extends BaseBus
             if(!empty($data['task_id'])) {
             if(!empty($data['task_id'])) {
                 $where[]=['task_id', '=', $data['task_id']];
                 $where[]=['task_id', '=', $data['task_id']];
             }
             }
+            if(!empty($data['norm_id'])) {
+                $where[]=['norm_id', '=', $data['norm_id']];
+            }
             if(!empty($data['name'])) {
             if(!empty($data['name'])) {
                 $where[]=['norm_list.name', 'like', "%{$data['name']}%"];
                 $where[]=['norm_list.name', 'like', "%{$data['name']}%"];
             }
             }

app/api/business/NormReceivesBus.php

@@ -40,6 +40,9 @@ class NormReceivesBus extends BaseBus
             if(!empty($data['user_id'])) {
             if(!empty($data['user_id'])) {
                 $where[]=['user_id', '=', $data['user_id']];
                 $where[]=['user_id', '=', $data['user_id']];
             }
             }
+            if(!empty($data['norm_id'])) {
+                $where[]=['norm_id', '=', $data['norm_id']];
+            }
             if(!empty($data['status']) || $data['status'] ==0) {
             if(!empty($data['status']) || $data['status'] ==0) {
                 $where[]=['status', 'in', "{$data['status']}"];
                 $where[]=['status', 'in', "{$data['status']}"];
             }
             }

app/api/controller/NormList.php

@@ -8,7 +8,7 @@ namespace app\api\controller;
 use app\common\business\CommonBus as CommonBus;
 use app\common\business\CommonBus as CommonBus;
 use app\common\model\redis\RedisModel;
 use app\common\model\redis\RedisModel;
 
 
-class NormList extends AuthBase
+class   NormList extends AuthBase
 {
 {
     /**
     /**
      * 当前可领取的指标列表
      * 当前可领取的指标列表
@@ -23,6 +23,7 @@ class NormList extends AuthBase
             $data['page'] = input("param.page",0,"intval");
             $data['page'] = input("param.page",0,"intval");
             $data['limit'] = input("param.limit",0,"intval");
             $data['limit'] = input("param.limit",0,"intval");
             $data['name'] = input("param.name");
             $data['name'] = input("param.name");
+            $data['norm_id'] = input("param.norm_id");
             $data['num'] = 1;
             $data['num'] = 1;
             // 分页数据
             // 分页数据
             $NormReceivesBus = new \app\api\business\CommonBus('NormReceivesBus'); // 通过公共业务初始化用户待领取指标类
             $NormReceivesBus = new \app\api\business\CommonBus('NormReceivesBus'); // 通过公共业务初始化用户待领取指标类

app/api/controller/NormReceives.php

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