From 90873f11f36a63218e9e83e2458ead905f97e437 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Wed, 12 Jul 2023 10:12:48 +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 | 1 + .../controller/DepositoryController.java | 5 + .../DepositoryRecordController.java | 39 +++++- .../impl/DepositoryRecordServiceImpl.java | 66 ++++++++- .../service/impl/GroupServiceImpl.java | 5 + .../service/impl/QyWxOperationService.java | 47 +++++-- .../service/impl/StockTakingServiceImpl.java | 129 +++++++++++------- .../templates/pages/chart/chart-in_back.html | 58 +++++++- .../templates/pages/chart/chart-out_back.html | 58 +++++++- .../pages/chart/chart-stock_back.html | 88 +++++++++++- .../pages/material/material-view_back.html | 115 ++++++++++++++-- .../templates/pages/chart/chart-in_back.html | 58 +++++++- .../templates/pages/chart/chart-out_back.html | 58 +++++++- .../pages/chart/chart-stock_back.html | 88 +++++++++++- 14 files changed, 726 insertions(+), 89 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 00807170..20e27cbf 100644 --- a/src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java +++ b/src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java @@ -343,6 +343,7 @@ public class PublicConfig { userByPort.setMaindeparment(361); userByPort.setMaindeparmentname("仓储中心"); } + return userByPort; } diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java index 099e8a5d..a7d989fa 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java @@ -999,6 +999,11 @@ public class DepositoryController { List list = new ArrayList<>(); for (Integer integer : userIdByDid) { UserByPort userByPort = PublicConfig.FindUserById(integer, userKey, token); + // 获取用户的用工关系 + int emptype = userByPort.getEmptype(); + if(emptype > 10){ + continue; + } UserByPortP user = new UserByPortP(userByPort); list.add(user); } diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index 55692086..db64f2fa 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -462,6 +462,11 @@ public class DepositoryRecordController { // 获取管理员数据 UserByPort userByPort = PublicConfig.FindUserById(uid, finalUserKey, finalToken); + // 获取用户的用工关系 + int emptype = userByPort.getEmptype(); + if (emptype > 10) { + continue; + } String workwechat = userByPort.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort.getWechat(); @@ -514,6 +519,11 @@ public class DepositoryRecordController { // 获取管理员数据 UserByPort userByPort = PublicConfig.FindUserById(uid, finalUserKey, finalToken); + // 获取用户的用工关系 + int emptype = userByPort.getEmptype(); + if (emptype > 10) { + continue; + } String workwechat = userByPort.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort.getWechat(); @@ -722,8 +732,12 @@ public class DepositoryRecordController { Object userId = map.get("userId"); if (userId != null) { UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(userId), userkey, usertoken); - map.put("departmenthead", userByPort.getId()); - map.put("depositoryManager", userToken.getId()); + // 获取用户的用工关系 + int emptype = userByPort.getEmptype(); + if (emptype <= 10) { + map.put("departmenthead", userByPort.getId()); + map.put("depositoryManager", userToken.getId()); + } } else { List departmentHeadByUsers = PublicConfig.findDepartmentHeadByUser(ObjectFormatUtil.toInteger(map.get("adminorgId")), userkey, usertoken); StringBuilder departmentHeadId = new StringBuilder(); @@ -1462,6 +1476,7 @@ public class DepositoryRecordController { for (String manager : managersSplit) { if (!"".equals(manager)) { UserByPort userByPort = PublicConfig.FindUserById(Integer.parseInt(manager), userKey, token); + if (!managerList.contains(userByPort)) { managerList.add(userByPort); } @@ -1732,6 +1747,11 @@ public class DepositoryRecordController { // 获取管理员数据 UserByPort userByPort = PublicConfig.FindUserById(uid, finalUserkey, finalUsertoken); + // 获取用户的用工关系 + int emptype = userByPort.getEmptype(); + if(emptype > 10){ + continue; + } String workwechat = userByPort.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort.getWechat(); @@ -1788,6 +1808,11 @@ public class DepositoryRecordController { // 获取管理员数据 UserByPort userByPort = PublicConfig.FindUserById(uid, finalUserkey, finalUsertoken); + // 获取用户的用工关系 + int emptype = userByPort.getEmptype(); + if(emptype > 10){ + continue; + } String workwechat = userByPort.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort.getWechat(); @@ -2016,6 +2041,11 @@ public class DepositoryRecordController { if (classes == 1) { // 获取管理员数据 UserByPort userByPort = PublicConfig.FindUserById(uid, finalUserkey, finalUsertoken); + // 获取用户的用工关系 + int emptype = userByPort.getEmptype(); + if(emptype > 10){ + continue; + } String workwechat = userByPort.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort.getWechat(); @@ -2066,6 +2096,11 @@ public class DepositoryRecordController { if (classes == 1) { // 获取管理员数据 UserByPort userByPort = PublicConfig.FindUserById(uid, finalUserkey, finalUsertoken); + // 获取用户的用工关系 + int emptype = userByPort.getEmptype(); + if(emptype > 10){ + continue; + } String workwechat = userByPort.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort.getWechat(); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index cfec26de..54401d4b 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -2665,7 +2665,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 将当前redis中存储的spno删除 redisPool.getRedisTemplateByDb(14).delete("wms_QyWxMessage_" + spNo); } - } else { + } + else { // 如果是前两个审批节点 //定义处理时间 @@ -3292,6 +3293,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { continue; } UserByPort depositoryManage = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(depositorymanager), userKey, token); + // 获取用户的用工关系 + int emptype = depositoryManage.getEmptype(); + if(emptype > 10){ + continue; + } String departmentHeadWorkwechat = depositoryManage.getWorkwechat(); if (departmentHeadWorkwechat == null || "".equals(departmentHeadWorkwechat)) { departmentHeadWorkwechat = depositoryManage.getWechat(); @@ -3346,6 +3352,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { continue; } UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(s), userKey, token); + // 获取用户的用工关系 + int emptype = userByPort.getEmptype(); + if(emptype > 10){ + continue; + } String workwechat = userByPort.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort.getWechat(); @@ -3398,6 +3409,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { continue; } UserByPort depositoryManage = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(depositorymanager), userKey, token); + // 获取用户的用工关系 + int emptype = depositoryManage.getEmptype(); + if(emptype > 10){ + continue; + } String departmentHeadWorkwechat = depositoryManage.getWorkwechat(); if (departmentHeadWorkwechat == null || "".equals(departmentHeadWorkwechat)) { departmentHeadWorkwechat = depositoryManage.getWechat(); @@ -3452,6 +3468,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { continue; } UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(s), userKey, token); + // 获取用户的用工关系 + int emptype = userByPort.getEmptype(); + if(emptype > 10){ + continue; + } String workwechat = userByPort.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort.getWechat(); @@ -3585,6 +3606,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { for (Integer integer : userIdByDid) { // 获取仓库管理员信息 UserByPort manager = PublicConfig.FindUserById(integer, userKey, token); + // 获取用户的用工关系 + int emptype = manager.getEmptype(); + if(emptype > 10){ + continue; + } updateRedisDataForUserManager(integer, minRecordKey); minRecordManage.append(integer).append(","); String workwechat = manager.getWorkwechat(); @@ -3665,6 +3691,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { updateRedisDataForUserManager(integer, minRecordKey); // 获取仓库管理员信息 UserByPort manager = PublicConfig.FindUserById(integer, userKey, token); + // 获取用户的用工关系 + int emptype = manager.getEmptype(); + if(emptype > 10){ + continue; + } minRecordManage.append(integer).append(","); String workwechat = manager.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { @@ -3698,6 +3729,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { continue; } UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(s), userKey, token); + // 获取用户的用工关系 + int emptype = userByPort.getEmptype(); + if(emptype > 10){ + continue; + } String workwechat = userByPort.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort.getWechat(); @@ -3740,10 +3776,15 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 获取responseCode（key为申请人number） //获取部门负责人信息 UserByPort departHead = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(record.getDepartmenthead()), userKey, token); - String key = "user:" + departHead.getNumber() + ":QyWxOutId:" + id; - String responseCode = (String) redisPool.getRedisTemplateByDb(15).opsForHash().get(key, "responseCode"); - qyWxOperationService.updateButtonTemplateCardToUnEnable(responseCode, userToken.getName(), finalResult, userAgent); - redisPool.getRedisTemplateByDb(15).delete(key); + // 获取用户的用工关系 + int emptype = departHead.getEmptype(); + if(emptype <= 10){ + String key = "user:" + departHead.getNumber() + ":QyWxOutId:" + id; + String responseCode = (String) redisPool.getRedisTemplateByDb(15).opsForHash().get(key, "responseCode"); + qyWxOperationService.updateButtonTemplateCardToUnEnable(responseCode, userToken.getName(), finalResult, userAgent); + redisPool.getRedisTemplateByDb(15).delete(key); + } + }); } map.put("id", id); @@ -3926,6 +3967,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { continue; } UserByPort userById = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(s), null, null); + // 获取用户的用工关系 + int emptype = userById.getEmptype(); + if(emptype > 10){ + continue; + } String workwechat = userById.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { workwechat = userById.getWechat(); @@ -4063,6 +4109,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { for (Integer integer : userIdByDid) { // 获取仓库管理员信息 UserByPort manager = PublicConfig.FindUserById(integer, userKey, token); + // 获取用户的用工关系 + int emptype = manager.getEmptype(); + if(emptype > 10){ + continue; + } updateRedisDataForUserManager(integer, minRecordKey); minRecordManage.append(integer).append(","); String workwechat = manager.getWorkwechat(); @@ -4142,6 +4193,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { updateRedisDataForUserManager(integer, minRecordKey); // 获取仓库管理员信息 UserByPort manager = PublicConfig.FindUserById(integer, userKey, token); + // 获取用户的用工关系 + int emptype = manager.getEmptype(); + if(emptype > 10){ + continue; + } minRecordManage.append(integer).append(","); String workwechat = manager.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java index 83c0e98e..c52a1c67 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java @@ -861,6 +861,11 @@ public class GroupServiceImpl implements GroupService { ) { // 获取管理员数据 UserByPort userByPort = PublicConfig.FindUserById(mt.getUid(), userKey, token); + // 获取用户的用工关系 + int emptype = userByPort.getEmptype(); + if(emptype > 10){ + continue; + } String workwechat = userByPort.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort.getWechat(); 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 fd6bfcd8..127adb01 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 @@ -1426,7 +1426,6 @@ public class QyWxOperationService { List notifyerList = new ArrayList<>(); - // 获取当前出库明细 List minRecordList = depositoryRecordMapper.findApplicationOutRecordMinByParent(mainId); // 定义审批模板 @@ -1802,8 +1801,7 @@ public class QyWxOperationService { } - } - else if (flag == 12 ) { + } else if (flag == 12) { // 如果是备品备件库 // 获取申请用户所在部门的设备员 @@ -1909,8 +1907,7 @@ public class QyWxOperationService { otherDepartmentIdList = qyWxLabelUserList; } } - } - else { + } else { // 如果不是中心仓下的仓库 if (Integer.compare(2, flagForOpenDepository) == 0) { // 如果该仓库是通过开放仓库获取到的 @@ -1959,6 +1956,11 @@ public class QyWxOperationService { if (classes == 1) { // 如果是对人设置的权限 UserByPort userByPort = PublicConfig.FindUserById(userId, userKey, token); + // 获取用户的用工关系 + int emptype = userByPort.getEmptype(); + if (emptype > 10) { + continue; + } String user = userByPort.getWorkwechat(); if (user == null || "".equals(user)) { user = userByPort.getWechat(); @@ -1991,8 +1993,7 @@ public class QyWxOperationService { approval_template_approver_list.add(approval_template_approver_depository_manager); } } - } - else { + } else { for (Integer depositoryId : depositoryIdList ) { @@ -2010,6 +2011,11 @@ public class QyWxOperationService { if (classes == 1) { // 如果是对人设置的权限 UserByPort userByPort = PublicConfig.FindUserById(userId, userKey, token); + // 获取用户的用工关系 + int emptype = userByPort.getEmptype(); + if (emptype > 10) { + continue; + } String user = userByPort.getWorkwechat(); if (user == null || "".equals(user)) { user = userByPort.getWechat(); @@ -2058,7 +2064,7 @@ public class QyWxOperationService { String s = HttpUtils.doPost(url, jsonString); JSONObject jsonObject = JSONObject.parseObject(s); jsonObject.put("otherDepartmentIdList", JSONObject.toJSONString(otherDepartmentIdList)); - log.info("发送出库审批结果：" + s+"；发送给企业微信的数据："+jsonString); + log.info("发送出库审批结果：" + s + "；发送给企业微信的数据：" + jsonString); return jsonObject; } @@ -2112,6 +2118,11 @@ public class QyWxOperationService { continue; } UserByPort departmentHead = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(department), userKey, token); + // 获取用户的用工关系 + int emptype = departmentHead.getEmptype(); + if (emptype > 10) { + continue; + } String departmentHeadWorkwechat = departmentHead.getWorkwechat(); if (departmentHeadWorkwechat == null || "".equals(departmentHeadWorkwechat)) { departmentHeadWorkwechat = departmentHead.getWechat(); @@ -2439,6 +2450,11 @@ public class QyWxOperationService { continue; } UserByPort depositoryManage = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(depositorymanager), userKey, token); + // 获取用户的用工关系 + int emptype = depositoryManage.getEmptype(); + if (emptype > 10) { + continue; + } String departmentHeadWorkwechat = depositoryManage.getWorkwechat(); if (departmentHeadWorkwechat == null || "".equals(departmentHeadWorkwechat)) { departmentHeadWorkwechat = depositoryManage.getWechat(); @@ -2491,6 +2507,11 @@ public class QyWxOperationService { ) { // 获取对应管理员信息 UserByPort userByPort = PublicConfig.FindUserById(userId, userKey, token); + // 获取用户的用工关系 + int emptype = userByPort.getEmptype(); + if (emptype > 10) { + continue; + } String user = userByPort.getWorkwechat(); if (user == null || "".equals(user)) { user = userByPort.getWechat(); @@ -2550,6 +2571,11 @@ public class QyWxOperationService { ) { // 获取对应管理员信息 UserByPort userByPort = PublicConfig.FindUserById(userId, userKey, token); + // 获取用户的用工关系 + int emptype = userByPort.getEmptype(); + if (emptype > 10) { + continue; + } String user = userByPort.getWorkwechat(); if (user == null || "".equals(user)) { user = userByPort.getWechat(); @@ -2608,6 +2634,11 @@ public class QyWxOperationService { // 获取申请人的userId UserByPort userByPort = PublicConfig.FindUserById(minRecordList.get(0).getApplicantId(), userKey, token); + // 获取用户的用工关系 + int emptype = userByPort.getEmptype(); + if (emptype > 10) { + userByPort = userToken; + } String workwechat = userByPort.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort.getWechat(); 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 1ff0753b..f4b589a0 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 @@ -561,23 +561,28 @@ public class StockTakingServiceImpl implements StockTakingService { // 抄送盘点调账记录给盘点人员 SendQyWxMessageThreadPool.execute(() -> { // 获取盘点人员 -// UserByPort originator = PublicConfig.FindUserById(mainRecord.getOriginator(), userKey,token); +// UserByPort originator = PublicConfig.FindUserById(mainRecord.getOriginator(), userKey, token); + // 获取用户的用工关系 +// int emptype = originator.getEmptype(); +// if (emptype <= 10) { // String workwechat = originator.getWorkwechat(); -// if(workwechat == null || "".equals(workwechat)){ +// if (workwechat == null || "".equals(workwechat)) { // workwechat = originator.getWechat(); // } JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", mainId, normalMinId, userAgent, userKey, token); -// JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinId, userAgent,userKey,token); - // 将当前返回结果保存到redis中 - if (jsonObject != null) { - Map QyWxMessageMap = new HashMap<>(); - QyWxMessageMap.put("MsgId", jsonObject.getString("msgid")); - QyWxMessageMap.put("responseCode", jsonObject.getString("response_code")); - // key user:300450:QyWxOut:1 - redisPool.getRedisTemplateByDb(14).opsForHash().putAll("user:" + userToken.getNumber() + ":QyWxStockTakingCompleteId:" + mainId, QyWxMessageMap); - // 设置过期时间为三天 - redisPool.getRedisTemplateByDb(14).expire("user:" + userToken.getNumber() + ":QyWxStockTakingCompleteId:" + mainId, 72, TimeUnit.HOURS); - } +// JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinId, userAgent, userKey, token); +// 将当前返回结果保存到redis中 +// if (jsonObject != null) { +// Map QyWxMessageMap = new HashMap<>(); +// QyWxMessageMap.put("MsgId", jsonObject.getString("msgid")); +// QyWxMessageMap.put("responseCode", jsonObject.getString("response_code")); +// key user:300450:QyWxOut:1 +// redisPool.getRedisTemplateByDb(14).opsForHash().putAll("user:" + userToken.getNumber() + ":QyWxStockTakingCompleteId:" + mainId, QyWxMessageMap); +// 设置过期时间为三天 +// redisPool.getRedisTemplateByDb(14).expire("user:" + userToken.getNumber() + ":QyWxStockTakingCompleteId:" + mainId, 72, TimeUnit.HOURS); +// } +// } + }); } else { map.put("state", 1); @@ -1123,10 +1128,14 @@ public class StockTakingServiceImpl implements StockTakingService { // 获取responseCode（key为申请人number） Integer originator = mainRecord.getOriginator(); UserByPort userByPort = PublicConfig.FindUserById(originator, userKey, token); - //获取申请人信息 - String key = "user:" + userByPort.getNumber() + ":QyWxStockTakingCompleteId:" + mainId; - String responseCode = (String) redisPool.getRedisTemplateByDb(14).opsForHash().get(key, "responseCode"); - qyWxOperationService.updateButtonTemplateCardToUnEnable(responseCode, userToken.getName(), "处理", userAgent); + int emptype = userByPort.getEmptype(); + if (emptype <= 10) { + //获取申请人信息 + String key = "user:" + userByPort.getNumber() + ":QyWxStockTakingCompleteId:" + mainId; + String responseCode = (String) redisPool.getRedisTemplateByDb(14).opsForHash().get(key, "responseCode"); + qyWxOperationService.updateButtonTemplateCardToUnEnable(responseCode, userToken.getName(), "处理", userAgent); + } + }); return result; @@ -1846,23 +1855,27 @@ public class StockTakingServiceImpl implements StockTakingService { if (normalMinId.size() > 0) { SendQyWxMessageThreadPool.execute(() -> { // 获取盘点人员 -// UserByPort originator = PublicConfig.FindUserById(mainRecord.getOriginator(), userKey,token); +// UserByPort originator = PublicConfig.FindUserById(mainRecord.getOriginator(), userKey, token); +// int emptype = originator.getEmptype(); +// if(emptype <= 10){ // String workwechat = originator.getWorkwechat(); -// if(workwechat == null || "".equals(workwechat)){ -// workwechat = originator.getWechat(); -// } +// if (workwechat == null || "".equals(workwechat)) { +// workwechat = originator.getWechat(); +// } JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", ObjectFormatUtil.toInteger(mainId), normalMinId, userAgent, userKey, token); -// JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, ObjectFormatUtil.toInteger(mainId), normalMinId,userAgent,userKey,token); - // 将当前返回结果保存到redis中 - if (jsonObject != null) { - Map QyWxMessageMap = new HashMap<>(); - QyWxMessageMap.put("MsgId", jsonObject.getString("msgid")); - QyWxMessageMap.put("responseCode", jsonObject.getString("response_code")); - // key user:300450:QyWxOut:1 - redisPool.getRedisTemplateByDb(14).opsForHash().putAll("user:" + approver_user.getNumber() + ":QyWxStockTakingCompleteId:" + mainId, QyWxMessageMap); - // 设置过期时间为三天 - redisPool.getRedisTemplateByDb(14).expire("user:" + approver_user.getNumber() + ":QyWxStockTakingCompleteId:" + mainId, 72, TimeUnit.HOURS); - } +// JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, ObjectFormatUtil.toInteger(mainId), normalMinId, userAgent, userKey, token); +// 将当前返回结果保存到redis中 +// if (jsonObject != null) { +// Map QyWxMessageMap = new HashMap<>(); +// QyWxMessageMap.put("MsgId", jsonObject.getString("msgid")); +// QyWxMessageMap.put("responseCode", jsonObject.getString("response_code")); +// key user:300450:QyWxOut:1 +// redisPool.getRedisTemplateByDb(14).opsForHash().putAll("user:" + approver_user.getNumber() + ":QyWxStockTakingCompleteId:" + mainId, QyWxMessageMap); +// 设置过期时间为三天 +// redisPool.getRedisTemplateByDb(14).expire("user:" + approver_user.getNumber() + ":QyWxStockTakingCompleteId:" + mainId, 72, TimeUnit.HOURS); +// } +// } + }); } else { @@ -2718,13 +2731,17 @@ public class StockTakingServiceImpl implements StockTakingService { map.put("minIds", minIds); StringBuilder departMentHeadQyWxName = new StringBuilder(); UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(originator), userKey, token); - String workwechat = userByPort.getWorkwechat(); - if (workwechat == null || "".equals(workwechat)) { - workwechat = userByPort.getWechat(); - } + int emptype = userByPort.getEmptype(); + if (emptype <= 10) { + String workwechat = userByPort.getWorkwechat(); + if (workwechat == null || "".equals(workwechat)) { + workwechat = userByPort.getWechat(); + } // departMentHeadQyWxName.append(workwechat+","); - departMentHeadQyWxName.append("PangFuZhen,"); - JSONObject jsonObject = qyWxOperationService.sendCcStockTakingTransferMessageToHead(departMentHeadQyWxName.toString(), map, userToken, finalMainRecord, userAgent, userKey, token); + departMentHeadQyWxName.append("PangFuZhen,"); + JSONObject jsonObject = qyWxOperationService.sendCcStockTakingTransferMessageToHead(departMentHeadQyWxName.toString(), map, userToken, finalMainRecord, userAgent, userKey, token); + } + }); @@ -2906,23 +2923,27 @@ public class StockTakingServiceImpl implements StockTakingService { SendQyWxMessageThreadPool.execute((Runnable) () -> { // 获取盘点人员 UserByPort originator = PublicConfig.FindUserById(mainRecord.getOriginator(), userkey, token); -// String workwechat = originator.getWorkwechat(); + int emptype = originator.getEmptype(); + if (emptype <= 10) { + // String workwechat = originator.getWorkwechat(); // if(workwechat == null || "".equals(workwechat)){ // workwechat = originator.getWechat(); // } - JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", mainId, normalMinIds, userAgent, userkey, token); + JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", mainId, normalMinIds, userAgent, userkey, token); // JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinIds, userAgent,userkey,token); - if (jsonObject != null) { - // 将当前返回结果保存到redis中 - Map QyWxMessageMap = new HashMap<>(); - QyWxMessageMap.put("MsgId", jsonObject.getString("msgid")); - QyWxMessageMap.put("responseCode", jsonObject.getString("response_code")); - // key user:300450:QyWxOut:1 - // 申请人number - redisPool.getRedisTemplateByDb(14).opsForHash().putAll("user:" + originator.getNumber() + ":QyWxStockTakingCompleteId:" + mainId, QyWxMessageMap); - // 设置过期时间为三天 - redisPool.getRedisTemplateByDb(14).expire("user:" + originator.getNumber() + ":QyWxStockTakingCompleteId:" + mainId, 72, TimeUnit.HOURS); + if (jsonObject != null) { + // 将当前返回结果保存到redis中 + Map QyWxMessageMap = new HashMap<>(); + QyWxMessageMap.put("MsgId", jsonObject.getString("msgid")); + QyWxMessageMap.put("responseCode", jsonObject.getString("response_code")); + // key user:300450:QyWxOut:1 + // 申请人number + redisPool.getRedisTemplateByDb(14).opsForHash().putAll("user:" + originator.getNumber() + ":QyWxStockTakingCompleteId:" + mainId, QyWxMessageMap); + // 设置过期时间为三天 + redisPool.getRedisTemplateByDb(14).expire("user:" + originator.getNumber() + ":QyWxStockTakingCompleteId:" + mainId, 72, TimeUnit.HOURS); + } } + }); } else { @@ -2930,12 +2951,16 @@ public class StockTakingServiceImpl implements StockTakingService { SendQyWxMessageThreadPool.execute(() -> { // 获取盘点人员 UserByPort originator = PublicConfig.FindUserById(mainRecord.getOriginator(), userkey, token); -// String workwechat = originator.getWorkwechat(); + int emptype = originator.getEmptype(); + if(emptype<= 10){ + // String workwechat = originator.getWorkwechat(); // if(workwechat == null || "".equals(workwechat)){ // workwechat = originator.getWechat(); // } - qyWxOperationService.sendStockTakingErrMessageToHead("PangFuZhen,", errIds, mainRecord, null, userAgent, userkey, token); + qyWxOperationService.sendStockTakingErrMessageToHead("PangFuZhen,", errIds, mainRecord, null, userAgent, userkey, token); // qyWxOperationService.sendStockTakingErrMessageToHead(workwechat, errIds, mainRecord, null, userAgent,userkey,token); + } + }); } } else { diff --git a/src/main/resources/templates/pages/chart/chart-in_back.html b/src/main/resources/templates/pages/chart/chart-in_back.html index 4041d79d..552eed6a 100644 --- a/src/main/resources/templates/pages/chart/chart-in_back.html +++ b/src/main/resources/templates/pages/chart/chart-in_back.html @@ -200,6 +200,34 @@ } } ] + }, + toolbox: { + feature: { + myFull: { + show: true, + title: '全屏查看', + icon: 'path://M432.45,595.444c0,2.177-4.661,6.82-11.305,6.82c-6.475,0-11.306-4.567-11.306-6.82s4.852-6.812,11.306-6.812C427.841,588.632,432.452,593.191,432.45,595.444L432.45,595.444z M421.155,589.876c-3.009,0-5.448,2.495-5.448,5.572s2.439,5.572,5.448,5.572c3.01,0,5.449-2.495,5.449-5.572C426.604,592.371,424.165,589.876,421.155,589.876L421.155,589.876z M421.146,591.891c-1.916,0-3.47,1.589-3.47,3.549c0,1.959,1.554,3.548,3.47,3.548s3.469-1.589,3.469-3.548C424.614,593.479,423.062,591.891,421.146,591.891L421.146,591.891zM421.146,591.891', + onclick: function (e){ + var opts = e.getOption(); + opts.toolbox[0].feature.myFull.show=false; + //window.top表示最顶层iframe 如果在当页面全屏打开 删去window.top即可 + window.top.layer.open({ + title:false, + type:1, + area :["100%","100%"], + content:'
', + success:function(){ + var fullchart = echarts.init(window.top.document.getElementById('fullChart')); + fullchart.setOption(optionLineChartIn) + } + }) + } + }, + saveAsImage:{}, + dataZoom: { + yAxisIndex: 'none' + }, + } } }; @@ -220,7 +248,35 @@ tooltip:{ trigger:"axis", }, - series: [] + series: [], + toolbox: { + feature: { + myFull: { + show: true, + title: '全屏查看', + icon: 'path://M432.45,595.444c0,2.177-4.661,6.82-11.305,6.82c-6.475,0-11.306-4.567-11.306-6.82s4.852-6.812,11.306-6.812C427.841,588.632,432.452,593.191,432.45,595.444L432.45,595.444z M421.155,589.876c-3.009,0-5.448,2.495-5.448,5.572s2.439,5.572,5.448,5.572c3.01,0,5.449-2.495,5.449-5.572C426.604,592.371,424.165,589.876,421.155,589.876L421.155,589.876z M421.146,591.891c-1.916,0-3.47,1.589-3.47,3.549c0,1.959,1.554,3.548,3.47,3.548s3.469-1.589,3.469-3.548C424.614,593.479,423.062,591.891,421.146,591.891L421.146,591.891zM421.146,591.891', + onclick: function (e){ + var opts = e.getOption(); + opts.toolbox[0].feature.myFull.show=false; + //window.top表示最顶层iframe 如果在当页面全屏打开 删去window.top即可 + window.top.layer.open({ + title:false, + type:1, + area :["100%","100%"], + content:'
', + success:function(){ + var fullchart = echarts.init(window.top.document.getElementById('fullChart')); + fullchart.setOption(optionLineChartIn) + } + }) + } + }, + saveAsImage:{}, + dataZoom: { + yAxisIndex: 'none' + }, + } + } }; diff --git a/src/main/resources/templates/pages/chart/chart-out_back.html b/src/main/resources/templates/pages/chart/chart-out_back.html index 6e6fde43..4572ba17 100644 --- a/src/main/resources/templates/pages/chart/chart-out_back.html +++ b/src/main/resources/templates/pages/chart/chart-out_back.html @@ -208,6 +208,34 @@ } } ] + }, + toolbox: { + feature: { + myFull: { + show: true, + title: '全屏查看', + icon: 'path://M432.45,595.444c0,2.177-4.661,6.82-11.305,6.82c-6.475,0-11.306-4.567-11.306-6.82s4.852-6.812,11.306-6.812C427.841,588.632,432.452,593.191,432.45,595.444L432.45,595.444z M421.155,589.876c-3.009,0-5.448,2.495-5.448,5.572s2.439,5.572,5.448,5.572c3.01,0,5.449-2.495,5.449-5.572C426.604,592.371,424.165,589.876,421.155,589.876L421.155,589.876z M421.146,591.891c-1.916,0-3.47,1.589-3.47,3.549c0,1.959,1.554,3.548,3.47,3.548s3.469-1.589,3.469-3.548C424.614,593.479,423.062,591.891,421.146,591.891L421.146,591.891zM421.146,591.891', + onclick: function (e){ + var opts = e.getOption(); + opts.toolbox[0].feature.myFull.show=false; + //window.top表示最顶层iframe 如果在当页面全屏打开 删去window.top即可 + window.top.layer.open({ + title:false, + type:1, + area :["100%","100%"], + content:'
', + success:function(){ + var fullchart = echarts.init(window.top.document.getElementById('fullChart')); + fullchart.setOption(optionLineChartIn) + } + }) + } + }, + saveAsImage:{}, + dataZoom: { + yAxisIndex: 'none' + }, + } } }; @@ -228,7 +256,35 @@ tooltip: { trigger: "axis", }, - series: [] + series: [], + toolbox: { + feature: { + myFull: { + show: true, + title: '全屏查看', + icon: 'path://M432.45,595.444c0,2.177-4.661,6.82-11.305,6.82c-6.475,0-11.306-4.567-11.306-6.82s4.852-6.812,11.306-6.812C427.841,588.632,432.452,593.191,432.45,595.444L432.45,595.444z M421.155,589.876c-3.009,0-5.448,2.495-5.448,5.572s2.439,5.572,5.448,5.572c3.01,0,5.449-2.495,5.449-5.572C426.604,592.371,424.165,589.876,421.155,589.876L421.155,589.876z M421.146,591.891c-1.916,0-3.47,1.589-3.47,3.549c0,1.959,1.554,3.548,3.47,3.548s3.469-1.589,3.469-3.548C424.614,593.479,423.062,591.891,421.146,591.891L421.146,591.891zM421.146,591.891', + onclick: function (e){ + var opts = e.getOption(); + opts.toolbox[0].feature.myFull.show=false; + //window.top表示最顶层iframe 如果在当页面全屏打开 删去window.top即可 + window.top.layer.open({ + title:false, + type:1, + area :["100%","100%"], + content:'
', + success:function(){ + var fullchart = echarts.init(window.top.document.getElementById('fullChart')); + fullchart.setOption(optionLineChartIn) + } + }) + } + }, + saveAsImage:{}, + dataZoom: { + yAxisIndex: 'none' + }, + } + } }; diff --git a/src/main/resources/templates/pages/chart/chart-stock_back.html b/src/main/resources/templates/pages/chart/chart-stock_back.html index 62ad9bd4..81a7aa71 100644 --- a/src/main/resources/templates/pages/chart/chart-stock_back.html +++ b/src/main/resources/templates/pages/chart/chart-stock_back.html @@ -144,6 +144,34 @@ } } ] + }, + toolbox: { + feature: { + myFull: { + show: true, + title: '全屏查看', + icon: 'path://M432.45,595.444c0,2.177-4.661,6.82-11.305,6.82c-6.475,0-11.306-4.567-11.306-6.82s4.852-6.812,11.306-6.812C427.841,588.632,432.452,593.191,432.45,595.444L432.45,595.444z M421.155,589.876c-3.009,0-5.448,2.495-5.448,5.572s2.439,5.572,5.448,5.572c3.01,0,5.449-2.495,5.449-5.572C426.604,592.371,424.165,589.876,421.155,589.876L421.155,589.876z M421.146,591.891c-1.916,0-3.47,1.589-3.47,3.549c0,1.959,1.554,3.548,3.47,3.548s3.469-1.589,3.469-3.548C424.614,593.479,423.062,591.891,421.146,591.891L421.146,591.891zM421.146,591.891', + onclick: function (e){ + var opts = e.getOption(); + opts.toolbox[0].feature.myFull.show=false; + //window.top表示最顶层iframe 如果在当页面全屏打开 删去window.top即可 + window.top.layer.open({ + title:false, + type:1, + area :["100%","100%"], + content:'
', + success:function(){ + var fullchart = echarts.init(window.top.document.getElementById('fullChart')); + fullchart.setOption(optionLineChartIn) + } + }) + } + }, + saveAsImage:{}, + dataZoom: { + yAxisIndex: 'none' + }, + } } }; @@ -166,7 +194,35 @@ tooltip:{ trigger:"axis", }, - series: [] + series: [], + toolbox: { + feature: { + myFull: { + show: true, + title: '全屏查看', + icon: 'path://M432.45,595.444c0,2.177-4.661,6.82-11.305,6.82c-6.475,0-11.306-4.567-11.306-6.82s4.852-6.812,11.306-6.812C427.841,588.632,432.452,593.191,432.45,595.444L432.45,595.444z M421.155,589.876c-3.009,0-5.448,2.495-5.448,5.572s2.439,5.572,5.448,5.572c3.01,0,5.449-2.495,5.449-5.572C426.604,592.371,424.165,589.876,421.155,589.876L421.155,589.876z M421.146,591.891c-1.916,0-3.47,1.589-3.47,3.549c0,1.959,1.554,3.548,3.47,3.548s3.469-1.589,3.469-3.548C424.614,593.479,423.062,591.891,421.146,591.891L421.146,591.891zM421.146,591.891', + onclick: function (e){ + var opts = e.getOption(); + opts.toolbox[0].feature.myFull.show=false; + //window.top表示最顶层iframe 如果在当页面全屏打开 删去window.top即可 + window.top.layer.open({ + title:false, + type:1, + area :["100%","100%"], + content:'
', + success:function(){ + var fullchart = echarts.init(window.top.document.getElementById('fullChart')); + fullchart.setOption(optionLineChartIn) + } + }) + } + }, + saveAsImage:{}, + dataZoom: { + yAxisIndex: 'none' + }, + } + } }; @@ -202,7 +258,35 @@ data: [] } ], - series: [] + series: [], + toolbox: { + feature: { + myFull: { + show: true, + title: '全屏查看', + icon: 'path://M432.45,595.444c0,2.177-4.661,6.82-11.305,6.82c-6.475,0-11.306-4.567-11.306-6.82s4.852-6.812,11.306-6.812C427.841,588.632,432.452,593.191,432.45,595.444L432.45,595.444z M421.155,589.876c-3.009,0-5.448,2.495-5.448,5.572s2.439,5.572,5.448,5.572c3.01,0,5.449-2.495,5.449-5.572C426.604,592.371,424.165,589.876,421.155,589.876L421.155,589.876z M421.146,591.891c-1.916,0-3.47,1.589-3.47,3.549c0,1.959,1.554,3.548,3.47,3.548s3.469-1.589,3.469-3.548C424.614,593.479,423.062,591.891,421.146,591.891L421.146,591.891zM421.146,591.891', + onclick: function (e){ + var opts = e.getOption(); + opts.toolbox[0].feature.myFull.show=false; + //window.top表示最顶层iframe 如果在当页面全屏打开 删去window.top即可 + window.top.layer.open({ + title:false, + type:1, + area :["100%","100%"], + content:'
', + success:function(){ + var fullchart = echarts.init(window.top.document.getElementById('fullChart')); + fullchart.setOption(optionLineChartIn) + } + }) + } + }, + saveAsImage:{}, + dataZoom: { + yAxisIndex: 'none' + }, + } + } }; //动态加载相关数据 diff --git a/src/main/resources/templates/pages/material/material-view_back.html b/src/main/resources/templates/pages/material/material-view_back.html index 8fb7c8a6..74626d4f 100644 --- a/src/main/resources/templates/pages/material/material-view_back.html +++ b/src/main/resources/templates/pages/material/material-view_back.html @@ -142,16 +142,12 @@ -
+
-
-
- -
@@ -170,7 +166,6 @@
- - -