多个pdf文件问题

app/api/controller/ExcelFilessssssss.php

@@ -822,12 +822,19 @@ class ExcelFilessssssss extends BaseController
                             array_push($data['admin'],$arr);
                             array_push($data['admin'],$arr);
                         }
                         }
                         // 添加用户端
                         // 添加用户端
-                        if($normCollectsId){
+                        // 添加用户端
+                        if($normCollects){
                             $collectsInfo = Db::table('norm_collects_extend')->where('norm_collects_id', $normCollectsId)->select();
                             $collectsInfo = Db::table('norm_collects_extend')->where('norm_collects_id', $normCollectsId)->select();
                             foreach ($collectsInfo as  $collectsValue){
                             foreach ($collectsInfo as  $collectsValue){
                                 $arr = ['name'=>$collectsValue['extend_name'],'value'=>$collectsValue['extend_value']];
                                 $arr = ['name'=>$collectsValue['extend_name'],'value'=>$collectsValue['extend_value']];
                                 array_push($data['user'],$arr);
                                 array_push($data['user'],$arr);
                             }
                             }
+                        }else{
+                            $normExtendInfo = Db::table('norm_extend')->where('norm_id', $value['id'])->where('user_filled', 1)->select();
+                            foreach ($normExtendInfo as  $normExtendInfoValue){
+                                $arr = ['name'=>$normExtendInfoValue['extend_name'],'value'=>$normExtendInfoValue['extend_value']?$normExtendInfoValue['extend_value']:'/'];
+                                array_push($data['user'],$arr);
+                            }
                         }
                         }
                         // 添加第一条指标信息
                         // 添加第一条指标信息
                         array_push($sheet['data'],$data);
                         array_push($sheet['data'],$data);

app/api/controller/NormCollects.php

@@ -364,8 +364,19 @@ class   NormCollects extends AuthBase
         }
         }
     }
     }
 
 
+    /**
+     * 返回文件信息
+     * @return \josn|void
+     */
     public function getPdfList()
     public function getPdfList()
     {
     {
-
+        try{
+            $id = input("param.id",'',"trim");
+            $NormCollectsBus = new \app\api\business\CommonBus('NormCollectsBus'); // 通过公共业务初始化指标类
+            $info=  $NormCollectsBus->getConditionalQuery(['norm_receive_id'=>$id]);
+            return returnResult(config("config.code.success"),config("config.describe.success"),$info);
+        }catch (\Exception $e){
+            exception($e,'NormCollects.getPreserve');
+        }
     }
     }
 }
 }
\ No newline at end of file

app/api/route/api.php

@@ -85,6 +85,7 @@ Route::rule("normCollects/getPreserve","NormCollects/getPreserve"); // 数据获
 Route::rule("normCollects/detail","normCollects/detail"); // 查看指标填写详情
 Route::rule("normCollects/detail","normCollects/detail"); // 查看指标填写详情
 Route::rule("normCollects/modify","normCollects/modify"); // 修改指标填写详情
 Route::rule("normCollects/modify","normCollects/modify"); // 修改指标填写详情
 Route::rule("normCollects/notCollectible","normCollects/notCollectible"); // 数据不可采集
 Route::rule("normCollects/notCollectible","normCollects/notCollectible"); // 数据不可采集
+Route::rule("normCollects/getPdfList","normCollects/getPdfList"); // pdf文件信息
 
 
 /***************************上传 */
 /***************************上传 */
 Route::rule("upload/picture","upload/picture");
 Route::rule("upload/picture","upload/picture");