purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化商品导出excel的接口

Browse Source
This commit is contained in:
神话
2022-05-03 17:01:48 +08:00
parent 15743a2952
commit 8940b6e846
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
View File

@@ -303,18 +303,18 @@ public class MaterialController {
*/ */
@GetMapping(value = "/exportExcel") @GetMapping(value = "/exportExcel")
@ApiOperation(value = "生成excel表格") @ApiOperation(value = "生成excel表格")
public void exportExcel(@RequestParam("categoryId") String categoryId, public void exportExcel(@RequestParam(value = "categoryId", required = false) String categoryId,
@RequestParam("barCode") String barCode, @RequestParam(value = "barCode", required = false) String barCode,
@RequestParam("name") String name, @RequestParam(value = "name", required = false) String name,
@RequestParam("standard") String standard, @RequestParam(value = "standard", required = false) String standard,
@RequestParam("model") String model, @RequestParam(value = "model", required = false) String model,
@RequestParam("color") String color, @RequestParam(value = "color", required = false) String color,
@RequestParam("weight") String weight, @RequestParam(value = "weight", required = false) String weight,
@RequestParam("expiryNum") String expiryNum, @RequestParam(value = "expiryNum", required = false) String expiryNum,
@RequestParam("enableSerialNumber") String enableSerialNumber, @RequestParam(value = "enableSerialNumber", required = false) String enableSerialNumber,
@RequestParam("enableBatchNumber") String enableBatchNumber, @RequestParam(value = "enableBatchNumber", required = false) String enableBatchNumber,
@RequestParam("remark") String remark, @RequestParam(value = "remark", required = false) String remark,
@RequestParam("mpList") String mpList, @RequestParam(value = "mpList", required = false) String mpList,
HttpServletRequest request, HttpServletResponse response) { HttpServletRequest request, HttpServletResponse response) {
try { try {
String[] mpArr = new String[]{}; String[] mpArr = new String[]{};

2
jshERP-boot/src/main/java/com/jsh/erp/utils/StringUtil.java
View File

@@ -254,7 +254,7 @@ public class StringUtil {
} }
public static String toNull(String value) { public static String toNull(String value) {
if(("").equals(value)) { if(isEmpty(value)) {
value = null; value = null;
} else { } else {
value = value.trim(); value = value.trim();