Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
daba3f95
Commit
daba3f95
authored
Dec 17, 2024
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):汇总表下载分批异步bug,汇总表页面字体调小,尽可能展示多的信息
parent
5a262fde
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
JgUseRegistrationServiceImpl.java
...ule/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
+5
-3
PressurePipeBasicInformationSummary.ftl
...sources/templates/PressurePipeBasicInformationSummary.ftl
+0
-0
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
View file @
daba3f95
...
...
@@ -2430,15 +2430,17 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
List
<
CompletableFuture
<
byte
[]>>
futures
=
IntStream
.
rangeClosed
(
1
,
page
)
.
mapToObj
(
current
->
CompletableFuture
.
supplyAsync
(()
->
{
exportParamsMap
.
put
(
"current"
,
current
);
// 创建独立的参数副本
Map
<
String
,
Object
>
currentExportParamsMap
=
new
HashMap
<>(
exportParamsMap
);
currentExportParamsMap
.
put
(
"current"
,
current
);
// 数据分页
int
start
=
(
current
-
1
)
*
size
;
int
end
=
((
current
-
1
)
*
size
+
size
)
<
total
?
(
current
-
1
)
*
size
+
size
:
(
int
)
total
;
// 数据截取
List
<
Object
>
equData
=
equipmentLists
.
subList
(
start
,
end
);
// 设备数据填充
this
.
pressurePipeEquData
(
e
xportParamsMap
,
equData
,
current
,
size
);
return
commonService
.
generateSummaryOfCylinderInfo
(
e
xportParamsMap
,
wordPath
,
filePrefix
);
this
.
pressurePipeEquData
(
currentE
xportParamsMap
,
equData
,
current
,
size
);
return
commonService
.
generateSummaryOfCylinderInfo
(
currentE
xportParamsMap
,
wordPath
,
filePrefix
);
})).
collect
(
Collectors
.
toList
());
CompletableFuture
.
allOf
(
futures
.
toArray
(
new
CompletableFuture
[
page
])).
join
();
return
futures
;
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/PressurePipeBasicInformationSummary.ftl
View file @
daba3f95
This source diff could not be displayed because it is too large. You can
view the blob
instead.
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