From a1e67a0b1bb0b60f87d2db7db17ec1b093e3b73e Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 19 四月 2024 11:04:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ManPakOutController.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ManPakOutController.java b/src/main/java/com/zy/asrs/controller/ManPakOutController.java
index fe998e3..10eafa2 100644
--- a/src/main/java/com/zy/asrs/controller/ManPakOutController.java
+++ b/src/main/java/com/zy/asrs/controller/ManPakOutController.java
@@ -58,6 +58,20 @@
return R.ok(manPakOutService.selectPage(new Page<>(curr, limit), wrapper));
}
+ @RequestMapping(value = "/ManPakOut/list/auth1")
+ @ManagerAuth
+ public R list1(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<ManPakOut> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert1(param, wrapper);
+
+ return R.ok(manPakOutService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
@RequestMapping(value = "/ManPakOut/detailed/auth")
@ManagerAuth
public R detailed(@RequestParam(defaultValue = "1")Integer curr,
@@ -86,7 +100,9 @@
userId = null;
}
- List<PakOutDTO> pakOutDTOS = manPakOutService.selectPakOut(docnum, stime, etime, curr, limit,userId);
+ String custName = Cools.isEmpty(param.get("cust_name")) ? "" : param.get("cust_name").toString();
+
+ List<PakOutDTO> pakOutDTOS = manPakOutService.selectPakOut(docnum, stime, etime, curr, limit,userId,custName);
for (PakOutDTO pakOutDTO:pakOutDTOS){
List<ManPakOut> manPakOuts = manPakOutService.selectList(new EntityWrapper<ManPakOut>().eq("doc_num", pakOutDTO.getDoc_num()));
for (ManPakOut manPakOut:manPakOuts){
@@ -101,7 +117,7 @@
}
- int count = manPakOutService.selectPakOutCount(docnum, stime, etime,curr, limit,userId);
+ int count = manPakOutService.selectPakOutCount(docnum, stime, etime,curr, limit,userId,custName);
Page<PakOutDTO> page = new Page<>();
// 鏈�鍚庢寜鐘舵�佹湭鍑哄簱->宸插嚭搴撴帓搴�
// page.setRecords(pakOutDTOS.stream().sorted(Comparator.comparingInt(PakOutDTO::getStatus)).collect(Collectors.toList()));
@@ -123,6 +139,19 @@
}
}
+ private <T> void convert1(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.eq(entry.getKey(), val);
+ }
+ }
+ }
+
@RequestMapping(value = "/ManPakOut/add/auth")
@ManagerAuth(memo = "鐢熸垚鎷ｈ揣鍗�")
@Transactional
--
Gitblit v1.9.1