Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
8940b6e8
Commit
8940b6e8
authored
May 03, 2022
by
神话
Browse files
优化商品导出excel的接口
parent
15743a29
Changes
2
Hide whitespace changes
Inline
Side-by-side
jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
View file @
8940b6e8
...
...
@@ -303,18 +303,18 @@ public class MaterialController {
*/
@GetMapping
(
value
=
"/exportExcel"
)
@ApiOperation
(
value
=
"生成excel表格"
)
public
void
exportExcel
(
@RequestParam
(
"categoryId"
)
String
categoryId
,
@RequestParam
(
"barCode"
)
String
barCode
,
@RequestParam
(
"name"
)
String
name
,
@RequestParam
(
"standard"
)
String
standard
,
@RequestParam
(
"model"
)
String
model
,
@RequestParam
(
"color"
)
String
color
,
@RequestParam
(
"weight"
)
String
weight
,
@RequestParam
(
"expiryNum"
)
String
expiryNum
,
@RequestParam
(
"enableSerialNumber"
)
String
enableSerialNumber
,
@RequestParam
(
"enableBatchNumber"
)
String
enableBatchNumber
,
@RequestParam
(
"remark"
)
String
remark
,
@RequestParam
(
"mpList"
)
String
mpList
,
public
void
exportExcel
(
@RequestParam
(
value
=
"categoryId"
,
required
=
false
)
String
categoryId
,
@RequestParam
(
value
=
"barCode"
,
required
=
false
)
String
barCode
,
@RequestParam
(
value
=
"name"
,
required
=
false
)
String
name
,
@RequestParam
(
value
=
"standard"
,
required
=
false
)
String
standard
,
@RequestParam
(
value
=
"model"
,
required
=
false
)
String
model
,
@RequestParam
(
value
=
"color"
,
required
=
false
)
String
color
,
@RequestParam
(
value
=
"weight"
,
required
=
false
)
String
weight
,
@RequestParam
(
value
=
"expiryNum"
,
required
=
false
)
String
expiryNum
,
@RequestParam
(
value
=
"enableSerialNumber"
,
required
=
false
)
String
enableSerialNumber
,
@RequestParam
(
value
=
"enableBatchNumber"
,
required
=
false
)
String
enableBatchNumber
,
@RequestParam
(
value
=
"remark"
,
required
=
false
)
String
remark
,
@RequestParam
(
value
=
"mpList"
,
required
=
false
)
String
mpList
,
HttpServletRequest
request
,
HttpServletResponse
response
)
{
try
{
String
[]
mpArr
=
new
String
[]{};
...
...
jshERP-boot/src/main/java/com/jsh/erp/utils/StringUtil.java
View file @
8940b6e8
...
...
@@ -254,7 +254,7 @@ public class StringUtil {
}
public
static
String
toNull
(
String
value
)
{
if
(
(
""
).
equals
(
value
))
{
if
(
isEmpty
(
value
))
{
value
=
null
;
}
else
{
value
=
value
.
trim
();
...
...
Write
Preview
Supports
Markdown
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