From 8e41c3abbae355b626158a276c08ee68d9afd0f5 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期四, 07 四月 2022 09:48:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index 94e5ab1..3fabcd7 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -92,7 +92,7 @@
matCode.setModiTime(new Date());
matCode.setAppeUser(getUserId());
matCode.setAppeTime(new Date());
- matCode.setMatNo(UUID.randomUUID().toString().replaceAll("-", ""));
+ // matCode.setMatNo(UUID.randomUUID().toString().replaceAll("-", ""));
matCodeService.insert(matCode);
return R.ok();
}
@@ -127,8 +127,15 @@
@ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "浜у搧浠ｅ彿鏁版嵁瀵煎嚭")
public void export(@RequestParam(required = false) String fileName,
@RequestParam(required = false) Integer rowCount,
+ @RequestParam(required = false) String ids,
HttpServletResponse response) throws Exception {
- List<MatCode> list = matCodeService.selectList(new EntityWrapper<>());
+ List<MatCode> list = null;
+ if(!Cools.isEmpty(ids)){
+ list = matCodeService.selectList(new EntityWrapper<MatCode>().last("where mat_no in (" + ids + ")"));
+ }else{
+ list = matCodeService.selectList(new EntityWrapper<>());
+ }
+// List<MatCode> list = matCodeService.selectList(new EntityWrapper<>());
List<MatCodeExcel> excels = new ArrayList<>();
for (MatCode matCode : list) {
MatCodeExcel excel = VersionUtils.getExcel(matCode);
@@ -228,4 +235,24 @@
return R.ok();
}
+ @RequestMapping("/matType/auth")
+ public R type(){
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (int i = 1; i < 4; i++) {
+ Map<String, Object> item = new HashMap<>();
+ item.put("id",i+"");
+ if (i == 1){
+ item.put("value","鍘熸潗鏂�");
+ }
+ if (i == 2){
+ item.put("value","鎴愬搧");
+ }
+ if (i == 3){
+ item.put("value","鍗婃垚鍝�");
+ }
+ result.add(item);
+ }
+
+ return R.ok(result);
+ }
}
--
Gitblit v1.9.1