Browse Source

修改出库查询排序算法

lwx_dev
erdanergou 2 years ago
parent
commit
0972f7b3cc
  1. 11
      src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
  2. 25
      src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

11
src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java

@ -1136,6 +1136,11 @@ public class DepositoryRecordController {
continue; continue;
} }
UserByPort departmenthead = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(value), userKey, token); UserByPort departmenthead = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(value), userKey, token);
// 获取用户的用工关系
int emptype = departmenthead.getEmptype();
if (emptype > 10) {
continue;
}
if ("".equals(useAdminorgName)) { if ("".equals(useAdminorgName)) {
useAdminorgName = departmenthead.getMaindeparmentname(); useAdminorgName = departmenthead.getMaindeparmentname();
} else { } else {
@ -1484,7 +1489,11 @@ public class DepositoryRecordController {
for (String manager : managersSplit) { for (String manager : managersSplit) {
if (!"".equals(manager)) { if (!"".equals(manager)) {
UserByPort userByPort = PublicConfig.FindUserById(Integer.parseInt(manager), userKey, token); UserByPort userByPort = PublicConfig.FindUserById(Integer.parseInt(manager), userKey, token);
// 获取用户的用工关系
int emptype = userByPort.getEmptype();
if (emptype > 10) {
continue;
}
if (!managerList.contains(userByPort)) { if (!managerList.contains(userByPort)) {
managerList.add(userByPort); managerList.add(userByPort);
} }

25
src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

@ -1935,6 +1935,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
) { ) {
// 获取管理员数据 // 获取管理员数据
UserByPort userByPort = PublicConfig.FindUserById(mt.getUid(), userKey, token); UserByPort userByPort = PublicConfig.FindUserById(mt.getUid(), userKey, token);
// 获取用户的用工关系
int emptype = userByPort.getEmptype();
if (emptype > 10) {
continue;
}
String workwechat = userByPort.getWorkwechat(); String workwechat = userByPort.getWorkwechat();
if (workwechat == null || "".equals(workwechat)) { if (workwechat == null || "".equals(workwechat)) {
workwechat = userByPort.getWechat(); workwechat = userByPort.getWechat();
@ -1948,6 +1953,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
) { ) {
// 获取管理员数据 // 获取管理员数据
UserByPort userByPort = PublicConfig.FindUserById(mt.getUserId(), userKey, token); UserByPort userByPort = PublicConfig.FindUserById(mt.getUserId(), userKey, token);
// 获取用户的用工关系
int emptype = userByPort.getEmptype();
if (emptype > 10) {
continue;
}
String workwechat = userByPort.getWorkwechat(); String workwechat = userByPort.getWorkwechat();
if (workwechat == null || "".equals(workwechat)) { if (workwechat == null || "".equals(workwechat)) {
workwechat = userByPort.getWechat(); workwechat = userByPort.getWechat();
@ -2352,6 +2362,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
} }
Integer uid = ObjectFormatUtil.toInteger(s); Integer uid = ObjectFormatUtil.toInteger(s);
UserByPort depositoryManager = PublicConfig.FindUserById(uid, userKey, token); UserByPort depositoryManager = PublicConfig.FindUserById(uid, userKey, token);
// 获取用户的用工关系
int emptype = depositoryManager.getEmptype();
if (emptype > 10) {
continue;
}
String workwechat = depositoryManager.getWorkwechat(); String workwechat = depositoryManager.getWorkwechat();
if (workwechat == null || "".equals(workwechat)) { if (workwechat == null || "".equals(workwechat)) {
workwechat = depositoryManager.getWechat(); workwechat = depositoryManager.getWechat();
@ -2543,6 +2558,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
for (Integer integer : userIdByMtId) { for (Integer integer : userIdByMtId) {
// 获取仓库管理员信息 // 获取仓库管理员信息
UserByPort manager = PublicConfig.FindUserById(integer, userKey, token); UserByPort manager = PublicConfig.FindUserById(integer, userKey, token);
// 获取用户的用工关系
int emptype = userByPort.getEmptype();
if (emptype > 10) {
continue;
}
updateRedisDataForUserManager(integer, minRecordKey); updateRedisDataForUserManager(integer, minRecordKey);
minRecordManage.append(integer).append(","); minRecordManage.append(integer).append(",");
String workwechat = manager.getWorkwechat(); String workwechat = manager.getWorkwechat();
@ -2623,6 +2643,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
updateRedisDataForUserManager(integer, minRecordKey); updateRedisDataForUserManager(integer, minRecordKey);
// 获取仓库管理员信息 // 获取仓库管理员信息
UserByPort manager = PublicConfig.FindUserById(integer, userKey, token); UserByPort manager = PublicConfig.FindUserById(integer, userKey, token);
// 获取用户的用工关系
int emptype = manager.getEmptype();
if (emptype > 10) {
continue;
}
minRecordManage.append(integer).append(","); minRecordManage.append(integer).append(",");
String workwechat = manager.getWorkwechat(); String workwechat = manager.getWorkwechat();
if (workwechat == null || "".equals(workwechat)) { if (workwechat == null || "".equals(workwechat)) {

Loading…
Cancel
Save