From 69f9830c33c12b2281997234202ef0e71c453fb1 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Wed, 12 Jul 2023 10:41:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=91=98=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E7=A6=BB=E8=81=8C=E4=B8=8E=E5=90=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/PublicConfig.java | 4 ++ .../controller/PageController.java | 8 +++ .../controller/StockTakingController.java | 52 +++++++++++-------- .../service/impl/QyWxOperationService.java | 4 ++ .../service/impl/StockTakingServiceImpl.java | 20 +++++++ 5 files changed, 67 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java b/src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java index 20e27cbf..567dc112 100644 --- a/src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java +++ b/src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java @@ -123,6 +123,10 @@ public class PublicConfig { if (position != null) { List allUserByMainDepartment = FindUserByAdminorg(maindepartment, userKey, userToken); for (UserByPort userByPort : allUserByMainDepartment) { + int emptype = userByPort.getEmptype(); + if(emptype>10){ + continue; + } if (Integer.compare(userByPort.getPosition(), position.getId()) == 0) { userByPortList.add(userByPort); } 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 bb9b0c68..0b1fbfe7 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -2773,6 +2773,10 @@ public class PageController { continue; } UserByPort manager = PublicConfig.findUserByPortByNumber(s); + int emptype = manager.getEmptype(); + if (emptype > 10) { + continue; + } managerName.append(manager.getName()).append(","); } stp.setDepartmentManagerName(managerName.toString()); @@ -2851,6 +2855,10 @@ public class PageController { continue; } UserByPort manager = PublicConfig.findUserByPortByNumber(s); + int emptype = manager.getEmptype(); + if (emptype > 10) { + continue; + } managerName.append(manager.getName()).append(","); } stp.setDepartmentManagerName(managerName.toString()); 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 e982ee15..a415c9dd 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java @@ -78,8 +78,12 @@ public class StockTakingController { continue; } UserByPort departmentManager = PublicConfig.findUserByPortByNumber(s); + int emptype = departmentManager.getEmptype(); + if (emptype > 10) { + continue; + } String workwechat = departmentManager.getWorkwechat(); - if(workwechat == null ||"".equals(workwechat)){ + if (workwechat == null || "".equals(workwechat)) { workwechat = departmentManager.getWechat(); } // QyWxDepartmentManager.append(workwechat+","); @@ -136,9 +140,9 @@ public class StockTakingController { Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); QyWxApprovalMap.put("mainId", mainId.toString()); - redisPool.getRedisTemplateByDb(14).opsForHash().putAll("wms_QyWxMessage_"+sp_no, QyWxApprovalMap); + redisPool.getRedisTemplateByDb(14).opsForHash().putAll("wms_QyWxMessage_" + sp_no, QyWxApprovalMap); // 设置过期时间为7天 - redisPool.getRedisTemplateByDb(14).expire("wms_QyWxMessage_"+sp_no, 7, TimeUnit.DAYS); + redisPool.getRedisTemplateByDb(14).expire("wms_QyWxMessage_" + sp_no, 7, TimeUnit.DAYS); }); } else { @@ -154,9 +158,9 @@ public class StockTakingController { Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); QyWxApprovalMap.put("mainId", mainId.toString()); - redisPool.getRedisTemplateByDb(14).opsForHash().putAll("wms_QyWxMessage_"+sp_no, QyWxApprovalMap); + redisPool.getRedisTemplateByDb(14).opsForHash().putAll("wms_QyWxMessage_" + sp_no, QyWxApprovalMap); // 设置过期时间为7天 - redisPool.getRedisTemplateByDb(14).expire("wms_QyWxMessage_"+sp_no, 7, TimeUnit.DAYS); + redisPool.getRedisTemplateByDb(14).expire("wms_QyWxMessage_" + sp_no, 7, TimeUnit.DAYS); }); } @@ -180,7 +184,7 @@ public class StockTakingController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); map.put("departmentHead", userToken.getNumber()); - List myTask = stockTakingService.findMyTask(map, userKey,token); + List myTask = stockTakingService.findMyTask(map, userKey, token); return new RestResponse(myTask, stockTakingService.findMyTaskCount(map), 200); } @@ -196,7 +200,7 @@ public class StockTakingController { userKey = (String) request.getSession().getAttribute("userKey"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - Map review = stockTakingService.review(map, userToken, crypt,userKey,token); + Map review = stockTakingService.review(map, userToken, crypt, userKey, token); if (review.containsKey("errMsg")) { // 如果有出错情况 @@ -219,7 +223,7 @@ public class StockTakingController { UserByPort userToken = AuthenticationTokenPool.getUserToken(token); String header = request.getHeader("user-agent"); String crypt = Md5.crypt(header); - Map complete = stockTakingService.completeStockTaking(map, userToken, crypt,userKey,token); + Map complete = stockTakingService.completeStockTaking(map, userToken, crypt, userKey, token); if (complete.containsKey("errMsg")) { // 如果有出错情况 return new RestResponse(complete, 666, new StatusInfo("有错误", "发现错误")); @@ -239,7 +243,7 @@ public class StockTakingController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); map.put("userId", userToken.getId()); - List myApply = stockTakingService.findMyApply(map,userKey,token); + List myApply = stockTakingService.findMyApply(map, userKey, token); return new RestResponse(myApply, stockTakingService.findMyApplyCount(map), 200); } @@ -285,13 +289,14 @@ public class StockTakingController { } map.put("minIds", minIdList); - Integer transfer = stockTakingService.stockTakingTransfer(map, userToken, crypt,userKey,token); + Integer transfer = stockTakingService.stockTakingTransfer(map, userToken, crypt, userKey, token); return CrudUtil.insertHandle(transfer, minIdList.size()); } /** * 用于暂存当前盘点记录 - * @param map 存储数据 + * + * @param map 存储数据 * @param request */ @PostMapping("/temporaryStorageForTakingResult") @@ -314,11 +319,12 @@ public class StockTakingController { /** * 用于删除暂存盘点记录 - * @param map 删除数据 + * + * @param map 删除数据 * @param request */ @PostMapping("/delTemporaryStorageForTakingResult") - public RestResponse delTemporaryStorageForTakingResult(@RequestBody Map map,HttpServletRequest request){ + public RestResponse delTemporaryStorageForTakingResult(@RequestBody Map map, HttpServletRequest request) { // 获取当前盘点人 String token = request.getHeader("user-token"); if (token == null) { @@ -331,7 +337,6 @@ public class StockTakingController { } - /** * 获取当前用户当前库存的盘点记录 * @@ -353,7 +358,7 @@ public class StockTakingController { Map entries = redisPool.getRedisTemplateByDb(15).opsForHash().entries(key); if (entries.size() > 0) { return new RestResponse(entries); - }else{ + } else { return new RestResponse(null); } } @@ -361,7 +366,8 @@ public class StockTakingController { /** * 用于提交申请 - * @param map 提交的数据 + * + * @param map 提交的数据 * @param request * @return */ @@ -448,8 +454,12 @@ public class StockTakingController { continue; } UserByPort departmentManager = PublicConfig.findUserByPortByNumber(s); + int emptype = departmentManager.getEmptype(); + if (emptype > 10) { + continue; + } String workwechat = departmentManager.getWorkwechat(); - if(workwechat == null ||"".equals(workwechat)){ + if (workwechat == null || "".equals(workwechat)) { workwechat = departmentManager.getWechat(); } // QyWxDepartmentManager.append(workwechat+","); @@ -465,9 +475,9 @@ public class StockTakingController { Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); QyWxApprovalMap.put("mainId", main.toString()); - redisPool.getRedisTemplateByDb(14).opsForHash().putAll("wms_QyWxMessage_"+sp_no, QyWxApprovalMap); + redisPool.getRedisTemplateByDb(14).opsForHash().putAll("wms_QyWxMessage_" + sp_no, QyWxApprovalMap); // 设置过期时间为7天 - redisPool.getRedisTemplateByDb(14).expire("wms_QyWxMessage_"+sp_no, 7, TimeUnit.DAYS); + redisPool.getRedisTemplateByDb(14).expire("wms_QyWxMessage_" + sp_no, 7, TimeUnit.DAYS); }); } } else { @@ -479,9 +489,9 @@ public class StockTakingController { Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); QyWxApprovalMap.put("mainId", finalMainId.toString()); - redisPool.getRedisTemplateByDb(14).opsForHash().putAll("wms_QyWxMessage_"+sp_no, QyWxApprovalMap); + redisPool.getRedisTemplateByDb(14).opsForHash().putAll("wms_QyWxMessage_" + sp_no, QyWxApprovalMap); // 设置过期时间为7天 - redisPool.getRedisTemplateByDb(14).expire("wms_QyWxMessage_"+sp_no, 7, TimeUnit.DAYS); + redisPool.getRedisTemplateByDb(14).expire("wms_QyWxMessage_" + sp_no, 7, TimeUnit.DAYS); }); } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java index b7c962b6..76a10430 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java @@ -3112,6 +3112,10 @@ public class QyWxOperationService { } // 获取负责人信息 UserByPort userByPort = PublicConfig.findUserByPortByNumber(manager); + int emptype = userByPort.getEmptype(); + if (emptype > 10) { + continue; + } Map contact_principal = new HashMap<>(); String workwechat1 = userByPort.getWorkwechat(); if (workwechat1 == null || "".equals(workwechat1)) { 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 f4b589a0..1ca8984a 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 @@ -430,6 +430,10 @@ public class StockTakingServiceImpl implements StockTakingService { continue; } UserByPort userByPort = PublicConfig.findUserByPortByNumber(s); + int emptype = userByPort.getEmptype(); + if (emptype > 10) { + continue; + } String workwechat = userByPort.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort.getWechat(); @@ -609,6 +613,10 @@ public class StockTakingServiceImpl implements StockTakingService { continue; } UserByPort userByPort = PublicConfig.findUserByPortByNumber(s); + int emptype = userByPort.getEmptype(); + if (emptype > 10) { + continue; + } String workwechat = userByPort.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort.getWechat(); @@ -660,6 +668,10 @@ public class StockTakingServiceImpl implements StockTakingService { continue; } UserByPort userByPort = PublicConfig.findUserByPortByNumber(s); + int emptype = userByPort.getEmptype(); + if (emptype > 10) { + continue; + } String workwechat = userByPort.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort.getWechat(); @@ -1653,6 +1665,10 @@ public class StockTakingServiceImpl implements StockTakingService { continue; } UserByPort userByPort1 = PublicConfig.findUserByPortByNumber(s); + int emptype = userByPort1.getEmptype(); + if (emptype > 10) { + continue; + } String workwechat = userByPort1.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort1.getWechat(); @@ -1721,6 +1737,10 @@ public class StockTakingServiceImpl implements StockTakingService { continue; } UserByPort userByPort = PublicConfig.findUserByPortByNumber(s); + int emptype = userByPort.getEmptype(); + if (emptype > 10) { + continue; + } String workwechat = userByPort.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort.getWechat();