From bdf5047ae48457ad397bd87a524cafc7beba03b3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 22 六月 2020 08:50:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index 34cdc89..f8f1bdf 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -55,6 +55,9 @@
EntityWrapper<MatCode> wrapper = new EntityWrapper<>();
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ else {
+ wrapper.orderBy("modi_time", false);
+ }
return R.ok(matCodeService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -120,7 +123,6 @@
excel.setBarcode(matCode.getBarcode());
excel.setMatName(matCode.getMatName());
excel.setStr1(matCode.getStr1());
- excel.setStr2(matCode.getStr2());
excels.add(excel);
if (rowCount != null && excels.size() >= rowCount){
break;
@@ -140,9 +142,9 @@
@RequestMapping(value = "/matCode/import/auth")
@ManagerAuth(memo = "鐗╂枡缂栫爜鏁版嵁瀵煎叆")
public R matCodeImport(MultipartFile file) throws IOException, InterruptedException {
- Thread.sleep(2000);
- EasyExcel.read(file.getInputStream(), MatCodeExcel.class, new MatCodeExcelListener()).sheet().doRead();
- return R.ok();
+ MatCodeExcelListener listener = new MatCodeExcelListener(getUserId());
+ EasyExcel.read(file.getInputStream(), MatCodeExcel.class, listener).sheet().doRead();
+ return R.ok("鎴愬姛瀵煎叆"+listener.getTotal()+"鏉＄墿鏂欎俊鎭�");
}
// 鎵撳嵃
--
Gitblit v1.9.1