pfz_smile
/
depositroy
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

修改人员筛选离职与否

lwx_dev
erdanergou 2 years ago
parent
313ff22800
commit
69f9830c33
5 changed files with 67 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java
  2. 8
      src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
  3. 52
      src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java
  4. 4
      src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java
  5. 20
      src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java

4
src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java
View File

@ -123,6 +123,10 @@ public class PublicConfig {
if (position != null) { if (position != null) {
List<UserByPort> allUserByMainDepartment = FindUserByAdminorg(maindepartment, userKey, userToken); List<UserByPort> allUserByMainDepartment = FindUserByAdminorg(maindepartment, userKey, userToken);
for (UserByPort userByPort : allUserByMainDepartment) { for (UserByPort userByPort : allUserByMainDepartment) {
int emptype = userByPort.getEmptype();
if(emptype>10){
continue;
}
if (Integer.compare(userByPort.getPosition(), position.getId()) == 0) { if (Integer.compare(userByPort.getPosition(), position.getId()) == 0) {
userByPortList.add(userByPort); userByPortList.add(userByPort);
} }

8
src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
View File

@ -2773,6 +2773,10 @@ public class PageController {
continue; continue;
} }
UserByPort manager = PublicConfig.findUserByPortByNumber(s); UserByPort manager = PublicConfig.findUserByPortByNumber(s);
int emptype = manager.getEmptype();
if (emptype > 10) {
continue;
}
managerName.append(manager.getName()).append(","); managerName.append(manager.getName()).append(",");
} }
stp.setDepartmentManagerName(managerName.toString()); stp.setDepartmentManagerName(managerName.toString());
@ -2851,6 +2855,10 @@ public class PageController {
continue; continue;
} }
UserByPort manager = PublicConfig.findUserByPortByNumber(s); UserByPort manager = PublicConfig.findUserByPortByNumber(s);
int emptype = manager.getEmptype();
if (emptype > 10) {
continue;
}
managerName.append(manager.getName()).append(","); managerName.append(manager.getName()).append(",");
} }
stp.setDepartmentManagerName(managerName.toString()); stp.setDepartmentManagerName(managerName.toString());

52
src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java
View File

@ -78,8 +78,12 @@ public class StockTakingController {
continue; continue;
} }
UserByPort departmentManager = PublicConfig.findUserByPortByNumber(s); UserByPort departmentManager = PublicConfig.findUserByPortByNumber(s);
int emptype = departmentManager.getEmptype();
if (emptype > 10) {
continue;
}
String workwechat = departmentManager.getWorkwechat(); String workwechat = departmentManager.getWorkwechat();
if(workwechat == null ||"".equals(workwechat)){ if (workwechat == null || "".equals(workwechat)) {
workwechat = departmentManager.getWechat(); workwechat = departmentManager.getWechat();
} }
// QyWxDepartmentManager.append(workwechat+","); // QyWxDepartmentManager.append(workwechat+",");
@ -136,9 +140,9 @@ public class StockTakingController {
Map<String, Object> QyWxApprovalMap = new HashMap<>(); Map<String, Object> QyWxApprovalMap = new HashMap<>();
QyWxApprovalMap.put("sp_no", sp_no); QyWxApprovalMap.put("sp_no", sp_no);
QyWxApprovalMap.put("mainId", mainId.toString()); 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天 // 设置过期时间为7天
redisPool.getRedisTemplateByDb(14).expire("wms_QyWxMessage_"+sp_no, 7, TimeUnit.DAYS); redisPool.getRedisTemplateByDb(14).expire("wms_QyWxMessage_" + sp_no, 7, TimeUnit.DAYS);
}); });
} else { } else {
@ -154,9 +158,9 @@ public class StockTakingController {
Map<String, Object> QyWxApprovalMap = new HashMap<>(); Map<String, Object> QyWxApprovalMap = new HashMap<>();
QyWxApprovalMap.put("sp_no", sp_no); QyWxApprovalMap.put("sp_no", sp_no);
QyWxApprovalMap.put("mainId", mainId.toString()); 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天 // 设置过期时间为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); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
map.put("departmentHead", userToken.getNumber()); map.put("departmentHead", userToken.getNumber());
List<SimpleStockTakingP> myTask = stockTakingService.findMyTask(map, userKey,token); List<SimpleStockTakingP> myTask = stockTakingService.findMyTask(map, userKey, token);
return new RestResponse(myTask, stockTakingService.findMyTaskCount(map), 200); return new RestResponse(myTask, stockTakingService.findMyTaskCount(map), 200);
} }
@ -196,7 +200,7 @@ public class StockTakingController {
userKey = (String) request.getSession().getAttribute("userKey"); userKey = (String) request.getSession().getAttribute("userKey");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
Map<String, Object> review = stockTakingService.review(map, userToken, crypt,userKey,token); Map<String, Object> review = stockTakingService.review(map, userToken, crypt, userKey, token);
if (review.containsKey("errMsg")) { if (review.containsKey("errMsg")) {
// 如果有出错情况 // 如果有出错情况
@ -219,7 +223,7 @@ public class StockTakingController {
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
String header = request.getHeader("user-agent"); String header = request.getHeader("user-agent");
String crypt = Md5.crypt(header); String crypt = Md5.crypt(header);
Map<String, Object> complete = stockTakingService.completeStockTaking(map, userToken, crypt,userKey,token); Map<String, Object> complete = stockTakingService.completeStockTaking(map, userToken, crypt, userKey, token);
if (complete.containsKey("errMsg")) { if (complete.containsKey("errMsg")) {
// 如果有出错情况 // 如果有出错情况
return new RestResponse(complete, 666, new StatusInfo("有错误", "发现错误")); return new RestResponse(complete, 666, new StatusInfo("有错误", "发现错误"));
@ -239,7 +243,7 @@ public class StockTakingController {
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
map.put("userId", userToken.getId()); map.put("userId", userToken.getId());
List<SimpleStockTakingP> myApply = stockTakingService.findMyApply(map,userKey,token); List<SimpleStockTakingP> myApply = stockTakingService.findMyApply(map, userKey, token);
return new RestResponse(myApply, stockTakingService.findMyApplyCount(map), 200); return new RestResponse(myApply, stockTakingService.findMyApplyCount(map), 200);
} }
@ -285,13 +289,14 @@ public class StockTakingController {
} }
map.put("minIds", minIdList); 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()); return CrudUtil.insertHandle(transfer, minIdList.size());
} }
/** /**
* 用于暂存当前盘点记录 * 用于暂存当前盘点记录
* @param map 存储数据 *
* @param map 存储数据
* @param request * @param request
*/ */
@PostMapping("/temporaryStorageForTakingResult") @PostMapping("/temporaryStorageForTakingResult")
@ -314,11 +319,12 @@ public class StockTakingController {
/** /**
* 用于删除暂存盘点记录 * 用于删除暂存盘点记录
* @param map 删除数据 *
* @param map 删除数据
* @param request * @param request
*/ */
@PostMapping("/delTemporaryStorageForTakingResult") @PostMapping("/delTemporaryStorageForTakingResult")
public RestResponse delTemporaryStorageForTakingResult(@RequestBody Map<String, Object> map,HttpServletRequest request){ public RestResponse delTemporaryStorageForTakingResult(@RequestBody Map<String, Object> map, HttpServletRequest request) {
// 获取当前盘点人 // 获取当前盘点人
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if (token == null) { if (token == null) {
@ -331,7 +337,6 @@ public class StockTakingController {
} }
/** /**
* 获取当前用户当前库存的盘点记录 * 获取当前用户当前库存的盘点记录
* *
@ -353,7 +358,7 @@ public class StockTakingController {
Map<Object, Object> entries = redisPool.getRedisTemplateByDb(15).opsForHash().entries(key); Map<Object, Object> entries = redisPool.getRedisTemplateByDb(15).opsForHash().entries(key);
if (entries.size() > 0) { if (entries.size() > 0) {
return new RestResponse(entries); return new RestResponse(entries);
}else{ } else {
return new RestResponse(null); return new RestResponse(null);
} }
} }
@ -361,7 +366,8 @@ public class StockTakingController {
/** /**
* 用于提交申请 * 用于提交申请
* @param map 提交的数据 *
* @param map 提交的数据
* @param request * @param request
* @return * @return
*/ */
@ -448,8 +454,12 @@ public class StockTakingController {
continue; continue;
} }
UserByPort departmentManager = PublicConfig.findUserByPortByNumber(s); UserByPort departmentManager = PublicConfig.findUserByPortByNumber(s);
int emptype = departmentManager.getEmptype();
if (emptype > 10) {
continue;
}
String workwechat = departmentManager.getWorkwechat(); String workwechat = departmentManager.getWorkwechat();
if(workwechat == null ||"".equals(workwechat)){ if (workwechat == null || "".equals(workwechat)) {
workwechat = departmentManager.getWechat(); workwechat = departmentManager.getWechat();
} }
// QyWxDepartmentManager.append(workwechat+","); // QyWxDepartmentManager.append(workwechat+",");
@ -465,9 +475,9 @@ public class StockTakingController {
Map<String, Object> QyWxApprovalMap = new HashMap<>(); Map<String, Object> QyWxApprovalMap = new HashMap<>();
QyWxApprovalMap.put("sp_no", sp_no); QyWxApprovalMap.put("sp_no", sp_no);
QyWxApprovalMap.put("mainId", main.toString()); 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天 // 设置过期时间为7天
redisPool.getRedisTemplateByDb(14).expire("wms_QyWxMessage_"+sp_no, 7, TimeUnit.DAYS); redisPool.getRedisTemplateByDb(14).expire("wms_QyWxMessage_" + sp_no, 7, TimeUnit.DAYS);
}); });
} }
} else { } else {
@ -479,9 +489,9 @@ public class StockTakingController {
Map<String, Object> QyWxApprovalMap = new HashMap<>(); Map<String, Object> QyWxApprovalMap = new HashMap<>();
QyWxApprovalMap.put("sp_no", sp_no); QyWxApprovalMap.put("sp_no", sp_no);
QyWxApprovalMap.put("mainId", finalMainId.toString()); 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天 // 设置过期时间为7天
redisPool.getRedisTemplateByDb(14).expire("wms_QyWxMessage_"+sp_no, 7, TimeUnit.DAYS); redisPool.getRedisTemplateByDb(14).expire("wms_QyWxMessage_" + sp_no, 7, TimeUnit.DAYS);
}); });
} }

4
src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java
View File

@ -3112,6 +3112,10 @@ public class QyWxOperationService {
} }
// 获取负责人信息 // 获取负责人信息
UserByPort userByPort = PublicConfig.findUserByPortByNumber(manager); UserByPort userByPort = PublicConfig.findUserByPortByNumber(manager);
int emptype = userByPort.getEmptype();
if (emptype > 10) {
continue;
}
Map<String, String> contact_principal = new HashMap<>(); Map<String, String> contact_principal = new HashMap<>();
String workwechat1 = userByPort.getWorkwechat(); String workwechat1 = userByPort.getWorkwechat();
if (workwechat1 == null || "".equals(workwechat1)) { if (workwechat1 == null || "".equals(workwechat1)) {

20
src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java
View File

@ -430,6 +430,10 @@ public class StockTakingServiceImpl implements StockTakingService {
continue; continue;
} }
UserByPort userByPort = PublicConfig.findUserByPortByNumber(s); UserByPort userByPort = PublicConfig.findUserByPortByNumber(s);
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();
@ -609,6 +613,10 @@ public class StockTakingServiceImpl implements StockTakingService {
continue; continue;
} }
UserByPort userByPort = PublicConfig.findUserByPortByNumber(s); UserByPort userByPort = PublicConfig.findUserByPortByNumber(s);
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();
@ -660,6 +668,10 @@ public class StockTakingServiceImpl implements StockTakingService {
continue; continue;
} }
UserByPort userByPort = PublicConfig.findUserByPortByNumber(s); UserByPort userByPort = PublicConfig.findUserByPortByNumber(s);
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();
@ -1653,6 +1665,10 @@ public class StockTakingServiceImpl implements StockTakingService {
continue; continue;
} }
UserByPort userByPort1 = PublicConfig.findUserByPortByNumber(s); UserByPort userByPort1 = PublicConfig.findUserByPortByNumber(s);
int emptype = userByPort1.getEmptype();
if (emptype > 10) {
continue;
}
String workwechat = userByPort1.getWorkwechat(); String workwechat = userByPort1.getWorkwechat();
if (workwechat == null || "".equals(workwechat)) { if (workwechat == null || "".equals(workwechat)) {
workwechat = userByPort1.getWechat(); workwechat = userByPort1.getWechat();
@ -1721,6 +1737,10 @@ public class StockTakingServiceImpl implements StockTakingService {
continue; continue;
} }
UserByPort userByPort = PublicConfig.findUserByPortByNumber(s); UserByPort userByPort = PublicConfig.findUserByPortByNumber(s);
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();

Write Preview
Loading…
Cancel
Save