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
71927fdf
Commit
71927fdf
authored
Apr 17, 2024
by
wenyi.chen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
完成批量导入批量导出,pdf多文件列表
parent
7f9a4c95
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
5 deletions
+12
-5
app/api/controller/ExcelFile.php
+0
-0
app/api/controller/Norm.php
+5
-4
app/api/controller/NormCollects.php
+7
-1
app/api/controller/System.php
+0
-0
No files found.
app/api/controller/ExcelFile.php
View file @
71927fdf
This diff is collapsed.
Click to expand it.
app/api/controller/Norm.php
View file @
71927fdf
...
...
@@ -269,8 +269,8 @@ class Norm
$data
[
'receivesList'
][
$index
][
'refer_type'
]
=
''
;
$data
[
'receivesList'
][
$index
][
'remark'
]
=
''
;
$data
[
'receivesList'
][
$index
][
'imgPath'
]
=
''
;
$data
[
'receivesList'
][
$index
][
'fileListPdf'
]
=
$collectsInfo
[
'fileListPdf'
]
;
$data
[
'receivesList'
][
$index
][
'file_name'
]
=
$collectsInfo
[
'file_name'
]
;
$data
[
'receivesList'
][
$index
][
'fileListPdf'
]
=
''
;
$data
[
'receivesList'
][
$index
][
'file_name'
]
=
''
;
$data
[
'receivesList'
][
$index
][
'normCollectsExtend'
]
=
$res
;
}
}
...
...
@@ -322,6 +322,7 @@ class Norm
$data
[
'receivesList'
][
$index
][
'norm_list_extend'
]
=
$NormListExtendBus
->
getConditionalQueryAll
([
'norm_list_id'
=>
$vlues
[
'norm_list_id'
]]);
$NormCollectsBus
=
new
CommonBus
(
'NormCollectsBus'
);
// 通过公共业务初始化指标类
$collectsInfo
=
$NormCollectsBus
->
getConditionalQuery
([
'norm_receive_id'
=>
$vlues
[
'id'
]]);
// 用户没有填写信息
if
(
$collectsInfo
){
$NormCollectsExtendBus
=
new
CommonBus
(
'NormCollectsExtendBus'
);
// 通过公共业务初始化指标类
$normCollectsExtend
=
$NormCollectsExtendBus
->
getConditionalQueryAll
([
'norm_collects_id'
=>
$collectsInfo
[
'id'
]]);
...
...
@@ -337,8 +338,8 @@ class Norm
$data
[
'receivesList'
][
$index
][
'refer_type'
]
=
''
;
$data
[
'receivesList'
][
$index
][
'remark'
]
=
''
;
$data
[
'receivesList'
][
$index
][
'imgPath'
]
=
''
;
$data
[
'receivesList'
][
$index
][
'fileListPdf'
]
=
$collectsInfo
[
'fileListPdf'
]
;
$data
[
'receivesList'
][
$index
][
'file_name'
]
=
$collectsInfo
[
'file_name'
]
;
$data
[
'receivesList'
][
$index
][
'fileListPdf'
]
=
''
;
$data
[
'receivesList'
][
$index
][
'file_name'
]
=
''
;
$data
[
'receivesList'
][
$index
][
'normCollectsExtend'
]
=
$res
;
}
}
...
...
app/api/controller/NormCollects.php
View file @
71927fdf
...
...
@@ -349,7 +349,7 @@ class NormCollects extends AuthBase
}
/**
*
数据保存
*
获取用户保存的数据
* @return void
*/
public
function
getPreserve
()
...
...
@@ -363,4 +363,9 @@ class NormCollects extends AuthBase
exception
(
$e
,
'NormCollects.getPreserve'
);
}
}
public
function
getPdfList
()
{
}
}
\ No newline at end of file
app/api/controller/System.php
View file @
71927fdf
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