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 | 78 +++++++++++++++++++++++++++++++++++----
1 files changed, 70 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ManPakOutController.java b/src/main/java/com/zy/asrs/controller/ManPakOutController.java
index ff45f55..10eafa2 100644
--- a/src/main/java/com/zy/asrs/controller/ManPakOutController.java
+++ b/src/main/java/com/zy/asrs/controller/ManPakOutController.java
@@ -8,6 +8,7 @@
import com.core.common.*;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderDomainParam;
+import com.zy.asrs.entity.param.PakOutDTO;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
import com.zy.common.config.AdminInterceptor;
@@ -53,9 +54,21 @@
EntityWrapper<ManPakOut> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
- wrapper.orderBy("create_time",false);
- }
+
+ 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));
}
@@ -69,12 +82,48 @@
EntityWrapper<ManPakOut> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
- wrapper.orderBy("create_time",false);
+
+ String docnum = String.valueOf(param.get("doc_num"));
+ if (Cools.isEmpty(docnum) || docnum.equals("null")) {
+ docnum = null;
}
- wrapper.isNotNull("name");
- Page<ManPakOut> manPakOutPage = manPakOutService.selectPage(new Page<>(curr, limit), wrapper);
- return R.ok(manPakOutPage);
+ Date stime = null;
+ Date etime = null;
+ if(param.get("create_time") != null){
+ String[] dates = param.get("create_time").toString().split(RANGE_TIME_LINK);
+ stime = DateUtils.convert(dates[0]);
+ etime = DateUtils.convert(dates[1]);
+ }
+
+ Long userId = getUserId();
+ if(getUser().getRoleId() == 2 || getUser().getRoleId() == 24){
+ userId = null;
+ }
+
+ 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){
+ if (manPakOut.getCount() < manPakOut.getAnfme()){
+ pakOutDTO.setStatus(0);
+ break;
+ }
+ }
+ if (pakOutDTO.getStatus() == null){
+ pakOutDTO.setStatus(1);
+ }
+
+ }
+
+ 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()));
+ page.setRecords(pakOutDTOS);
+ page.setTotal(count);
+ return R.ok(page);
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
@@ -90,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