From 4cf111439a54681832982a4bf25000ac408c9852 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Fri, 7 Apr 2023 11:55:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=BB=A5=E5=8F=8Aminiadmin=E6=BA=90=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PageController.java | 110 ++++++++++-------- .../controller/StockTakingController.java | 4 +- .../service/StockTakingService.java | 4 +- .../service/impl/StockTakingServiceImpl.java | 14 +-- 4 files changed, 68 insertions(+), 64 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index 176e6211..b9c60de2 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -314,57 +314,10 @@ public class PageController { if (b) { mv.setViewName("pages/other/welcome_mobile"); } else { - Map paramForTask = new HashMap<>(); - paramForTask.put("isDone", 0); - paramForTask.put("userId", userToken.getId()); - paramForTask.put("departmentHead", userToken.getNumber()); - - // 定义任务列表 - List list = new ArrayList<>(); - - // 查询出库任务 - List myTaskOut = depositoryRecordService.findMyTaskOut(paramForTask, userToken); - - for (SimpleApplicationOutOrInRecordP simpleApplicationOutOrInRecordP : myTaskOut) { - SimpleTaskP simpleTaskP = new SimpleTaskP(simpleApplicationOutOrInRecordP); - list.add(simpleTaskP); - } - // 查询盘点任务 - List task = stockTakingService.findMyTask(paramForTask, request); - for (SimpleStockTakingP simpleStockTakingP : task) { - SimpleTaskP simpleTaskP = new SimpleTaskP(simpleStockTakingP); - list.add(simpleTaskP); - } - - // 查询入库任务 - List myTaskIn = depositoryRecordService.findMyTaskIn(paramForTask, userToken); - for (SimpleApplicationOutOrInRecordP simpleApplicationOutOrInRecordP : myTaskIn) { - SimpleTaskP simpleTaskP = new SimpleTaskP(simpleApplicationOutOrInRecordP); - list.add(simpleTaskP); - } - - String key = "user:" + userToken.getId().toString(); - String minRecord = (String) redisTemplateForHash.opsForHash().get(key, "minRecord"); - if (minRecord != null) { - // 获取子订单键值 - String[] split = minRecord.replace("[", "").replace("]", "").split(","); - for (String s : split) { - if ("".equals(s)) { - continue; - } - Integer minRecordId = ObjectFormatUtil.toInteger(s.split(":")[1].trim()); - ApplicationOutRecordMinP applicationOutMinById = depositoryRecordService.findApplicationOutMinById(minRecordId); - ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(applicationOutMinById.getParentId()); - UserByPort userByPort = LinkInterfaceUtil.FindUserById(applicationOutRecordPById.getApplicantId(), userToken); - applicationOutRecordPById.setApplicantName(userByPort.getName()); - SimpleTaskP simpleTaskP = new SimpleTaskP(applicationOutRecordPById, applicationOutMinById); - list.add(simpleTaskP); - } - } + List list = getUserSimpleTaskP(userToken); mv.setViewName("pages/other/welcome"); mv.addObject("myTaskList", list); - Map map = new HashMap<>(); map.put("begin", 0); map.put("size", 6); @@ -3188,6 +3141,8 @@ public class PageController { } + + // 用于跳转到库存盘点时编辑页面 @GetMapping("/stockTakingInfoForInventory") public ModelAndView stockTakingInfoForInventory(@RequestParam Map param, HttpServletRequest request) { @@ -3228,4 +3183,63 @@ public class PageController { return mv; } + + /** + * 用于获取当前用户的任务列表 + * @param userToken 当前用户 + * @return + */ + public List getUserSimpleTaskP(UserByPort userToken){ + Map paramForTask = new HashMap<>(); + paramForTask.put("isDone", 0); + paramForTask.put("userId", userToken.getId()); + paramForTask.put("departmentHead", userToken.getNumber()); + + // 定义任务列表 + List list = new ArrayList<>(); + + // 查询出库任务 + List myTaskOut = depositoryRecordService.findMyTaskOut(paramForTask, userToken); + + for (SimpleApplicationOutOrInRecordP simpleApplicationOutOrInRecordP : myTaskOut) { + SimpleTaskP simpleTaskP = new SimpleTaskP(simpleApplicationOutOrInRecordP); + list.add(simpleTaskP); + } + // 查询盘点任务 + List task = stockTakingService.findMyTask(paramForTask, userToken); + for (SimpleStockTakingP simpleStockTakingP : task) { + SimpleTaskP simpleTaskP = new SimpleTaskP(simpleStockTakingP); + list.add(simpleTaskP); + } + + // 查询入库任务 + List myTaskIn = depositoryRecordService.findMyTaskIn(paramForTask, userToken); + for (SimpleApplicationOutOrInRecordP simpleApplicationOutOrInRecordP : myTaskIn) { + SimpleTaskP simpleTaskP = new SimpleTaskP(simpleApplicationOutOrInRecordP); + list.add(simpleTaskP); + } + + String key = "user:" + userToken.getId().toString(); + String minRecord = (String) redisTemplateForHash.opsForHash().get(key, "minRecord"); + if (minRecord != null) { + // 获取子订单键值 + String[] split = minRecord.replace("[", "").replace("]", "").split(","); + for (String s : split) { + if ("".equals(s)) { + continue; + } + Integer minRecordId = ObjectFormatUtil.toInteger(s.split(":")[1].trim()); + ApplicationOutRecordMinP applicationOutMinById = depositoryRecordService.findApplicationOutMinById(minRecordId); + ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(applicationOutMinById.getParentId()); + UserByPort userByPort = LinkInterfaceUtil.FindUserById(applicationOutRecordPById.getApplicantId(), userToken); + applicationOutRecordPById.setApplicantName(userByPort.getName()); + SimpleTaskP simpleTaskP = new SimpleTaskP(applicationOutRecordPById, applicationOutMinById); + list.add(simpleTaskP); + } + } + return list; + } + + + } diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java b/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java index 7b0d1645..ee31203c 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java @@ -212,7 +212,7 @@ public class StockTakingController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); map.put("departmentHead", userToken.getNumber()); - List myTask = stockTakingService.findMyTask(map, request); + List myTask = stockTakingService.findMyTask(map, userToken); return new RestResponse(myTask, stockTakingService.findMyTaskCount(map), 200); } @@ -265,7 +265,7 @@ public class StockTakingController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); map.put("userId", userToken.getId()); - List myTask = stockTakingService.findMyApply(map, request); + List myTask = stockTakingService.findMyApply(map, userToken); return new RestResponse(myTask, stockTakingService.findMyApplyCount(map), 200); } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/StockTakingService.java b/src/main/java/com/dreamchaser/depository_manage/service/StockTakingService.java index ed4878a0..dce62a91 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/StockTakingService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/StockTakingService.java @@ -40,7 +40,7 @@ public interface StockTakingService { * @param map 查询参数 * @return 我的任务 */ - List findMyTask(Map map, HttpServletRequest request); + List findMyTask(Map map, UserByPort userToken); /** * 查询用户的任务数量 @@ -54,7 +54,7 @@ public interface StockTakingService { * @param map 查询参数 * @return 我的任务 */ - List findMyApply(Map map, HttpServletRequest request); + List findMyApply(Map map, UserByPort userToken); /** * 查询用户的申请数量 diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java index cbdbbcfc..de501d63 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java @@ -239,12 +239,7 @@ public class StockTakingServiceImpl implements StockTakingService { * @return 我的任务 */ @Override - public List findMyTask(Map map, HttpServletRequest request) { - String token = request.getHeader("user-token"); - if (token == null) { - token = (String) request.getSession().getAttribute("userToken"); - } - UserByPort userToken = AuthenticationTokenPool.getUserToken(token); + public List findMyTask(Map map,UserByPort userToken) { Integer size = 10, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); @@ -287,13 +282,8 @@ public class StockTakingServiceImpl implements StockTakingService { * @return 我的任务 */ @Override - public List findMyApply(Map map, HttpServletRequest request) { + public List findMyApply(Map map, UserByPort userToken) { Integer size = 10, page = 1; - String token = request.getHeader("user-token"); - if (token == null) { - token = (String) request.getSession().getAttribute("userToken"); - } - UserByPort userToken = AuthenticationTokenPool.getUserToken(token); if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size);