Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
lanbaoming
jiedao-api-boot-master
Commits
224e0c4c
Commit
224e0c4c
authored
Feb 11, 2025
by
Smile
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
需求97 空运提单下载/预览调整,后台代码部分提交
parent
878d7a2f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
11 deletions
+11
-11
AirHtmlToPdfUtil.java
.../cn/iocoder/yudao/module/order/util/AirHtmlToPdfUtil.java
+9
-9
airTemplate.ftl
yudao-server/src/main/resources/templates/airTemplate.ftl
+1
-1
airTemplateNoFee.ftl
...-server/src/main/resources/templates/airTemplateNoFee.ftl
+1
-1
No files found.
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/util/AirHtmlToPdfUtil.java
View file @
224e0c4c
...
...
@@ -57,12 +57,12 @@ public class AirHtmlToPdfUtil {
PdfDocument
pdfDocument
=
pdfDocumentEvent
.
getDocument
();
Document
doc
=
new
Document
(
pdfDocument
);
int
pageNumber
=
pdfDocument
.
getPageNumber
(
page
);
//当前页码
if
(
pageNumber
!=
1
)
{
//表示不是首页
this
.
addPageHeader
(
doc
,
pdfDocument
);
//
if (pageNumber != 1) {//表示不是首页
//
this.addPageHeader(doc, pdfDocument);
//this.addPageFooter(doc, pdfDocument);
}
else
{
//
} else {
//this.addPageFooter(doc, pdfDocument);
}
//
}
}
/**
...
...
@@ -147,11 +147,11 @@ public class AirHtmlToPdfUtil {
// 4-往 Document 添加内容
for
(
IElement
e
:
elements
)
{
if
(
document
.
getPdfDocument
().
getNumberOfPages
()
==
0
)
{
document
.
setMargins
(
0
,
10
,
200
,
10
);
}
else
{
document
.
setMargins
(
130
,
10
,
200
,
10
);
}
//
if (document.getPdfDocument().getNumberOfPages() == 0) {
//
document.setMargins(0, 10, 200, 10);
//
} else {
//
document.setMargins(130, 10, 200, 10);
//
}
BlockElement
blockElement
=
(
BlockElement
)
e
;
//blockElement.setMargins(1, 0, 1, 0);
...
...
yudao-server/src/main/resources/templates/airTemplate.ftl
View file @
224e0c4c
...
...
@@ -301,7 +301,7 @@
</tbody>
</table>
<!--账户信息-->
<table class="efg" style="width:100%;margin-bottom:
2
rem;">
<table class="efg" style="width:100%;margin-bottom:
0.4
rem;">
<tbody>
<tr style="height:25px;font-family: 'Times New Roman';">
<th
...
...
yudao-server/src/main/resources/templates/airTemplateNoFee.ftl
View file @
224e0c4c
...
...
@@ -204,7 +204,7 @@
</tbody>
</table>
<!--账户信息-->
<table class="efg" style="width:100%;margin-bottom:
2
rem;">
<table class="efg" style="width:100%;margin-bottom:
0.4
rem;">
<tbody>
<tr style="height:25px;font-family: 'Times New Roman';">
<th
...
...
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