Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
data-collect-api
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wenyi.chen
data-collect-api
Commits
cdeb8398
Commit
cdeb8398
authored
Apr 18, 2024
by
cwy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
多个pdf文件问题
parent
71927fdf
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
2 deletions
+22
-2
app/api/controller/ExcelFile.php
+0
-0
app/api/controller/ExcelFilessssssss.php
+8
-1
app/api/controller/NormCollects.php
+13
-1
app/api/route/api.php
+1
-0
No files found.
app/api/controller/ExcelFile.php
View file @
cdeb8398
This diff is collapsed.
Click to expand it.
app/api/controller/ExcelFilessssssss.php
View file @
cdeb8398
...
...
@@ -822,12 +822,19 @@ class ExcelFilessssssss extends BaseController
array_push
(
$data
[
'admin'
],
$arr
);
}
// 添加用户端
if
(
$normCollectsId
){
// 添加用户端
if
(
$normCollects
){
$collectsInfo
=
Db
::
table
(
'norm_collects_extend'
)
->
where
(
'norm_collects_id'
,
$normCollectsId
)
->
select
();
foreach
(
$collectsInfo
as
$collectsValue
){
$arr
=
[
'name'
=>
$collectsValue
[
'extend_name'
],
'value'
=>
$collectsValue
[
'extend_value'
]];
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
);
...
...
app/api/controller/NormCollects.php
View file @
cdeb8398
...
...
@@ -364,8 +364,19 @@ class NormCollects extends AuthBase
}
}
/**
* 返回文件信息
* @return \josn|void
*/
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
View file @
cdeb8398
...
...
@@ -85,6 +85,7 @@ Route::rule("normCollects/getPreserve","NormCollects/getPreserve"); // 数据获
Route
::
rule
(
"normCollects/detail"
,
"normCollects/detail"
);
// 查看指标填写详情
Route
::
rule
(
"normCollects/modify"
,
"normCollects/modify"
);
// 修改指标填写详情
Route
::
rule
(
"normCollects/notCollectible"
,
"normCollects/notCollectible"
);
// 数据不可采集
Route
::
rule
(
"normCollects/getPdfList"
,
"normCollects/getPdfList"
);
// pdf文件信息
/***************************上传 */
Route
::
rule
(
"upload/picture"
,
"upload/picture"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment