Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
c73bf791
authored
Nov 15, 2018
by
chongli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复活动订单导出的异常
parent
59c99452
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletions
src/main/java/com/ctrip/fun/admin/controller/order/OpVoucherOrderController.java
src/main/java/com/ctrip/fun/admin/controller/order/OpVoucherOrderController.java
View file @
c73bf791
...
...
@@ -96,13 +96,14 @@ public class OpVoucherOrderController extends AbstractOpOrderController<VoucherO
StringBuilder
excel
=
new
StringBuilder
(
"/voucherOrder/excel/"
+
listType
+
"?"
);
String
userName
=
(
form
.
getUserName
()
==
null
)
?
(
""
)
:
(
form
.
getUserName
());
String
orderName
=
(
form
.
getOrderName
()
==
null
)
?
(
""
)
:
(
form
.
getOrderName
());
String
recommendUserName
=
(
form
.
getRecommendUserName
()
==
null
)
?
(
""
)
:
(
form
.
getRecommendUserName
());
String
recommendPhone
=
(
form
.
getRecommendPhone
()
==
null
)
?
(
""
)
:
(
form
.
getRecommendPhone
());
String
userId
=
(
form
.
getUserId
()
==
null
)
?
(
""
)
:
(
form
.
getUserId
());
SimpleDateFormat
format
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
String
orderStartDate
=
(
form
.
getOrderStartDate
()
==
null
)
?
(
""
)
:
(
format
.
format
(
form
.
getOrderStartDate
()));
String
orderEndDate
=
(
form
.
getOrderEndDate
()
==
null
)
?
(
""
)
:
(
format
.
format
(
form
.
getOrderEndDate
()));
excel
.
append
(
"orderNo="
).
append
(
form
.
getOrderNo
()).
append
(
"&orderName="
).
append
(
form
.
getOrderName
()
).
append
(
"&userId="
).
append
(
userId
).
append
(
"&userName="
).
append
(
userName
).
append
(
"&orderStartDate="
).
append
(
orderStartDate
)
excel
.
append
(
"orderNo="
).
append
(
form
.
getOrderNo
()).
append
(
"&orderName="
).
append
(
orderName
).
append
(
"&userId="
).
append
(
userId
).
append
(
"&userName="
).
append
(
userName
).
append
(
"&orderStartDate="
).
append
(
orderStartDate
)
.
append
(
"&orderEndDate="
).
append
(
orderEndDate
).
append
(
"&total="
).
append
(
total
).
append
(
"&recommendPhone="
).
append
(
recommendPhone
).
append
(
"&recommendUserName="
).
append
(
recommendUserName
);
model
.
put
(
"excelpath"
,
excel
.
toString
());
...
...
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