suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更改督导逻辑-是否有角色

Browse Source
This commit is contained in:
guohb
2024-06-05 21:13:34 +08:00
parent 60ba1d54d6
commit 04d8b808cb
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java
View File

@@ -165,7 +165,7 @@ public class FirstOrderServiceImp implements FirstOrderService {
}
ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId);
EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getSupervisorUserId());
order.setSubmiter(userInfoById.getName()+"_"+userInfoById.getJobnumber());
order.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()+"_"+userInfoById.getJobnumber());
return order;
}
}

16
coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java
View File

@@ -116,14 +116,20 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
OpeningOperationPlanDO openingOperationPlanDO = openingOperationPlanDAO.selectByShopId(shopId);
EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getSupervisorUserId());
List<EnterpriseUserDO> allUserByRoleEnumAndRegionId = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.OPERATIONS_MANAGER, shopInfo.getRegionId());
List<String> collect = allUserByRoleEnumAndRegionId.stream()
List<String> collect = new ArrayList<>();
if (CollectionUtils.isEmpty(allUserByRoleEnumAndRegionId)){
collect = null;
}else {
collect = allUserByRoleEnumAndRegionId.stream()
.filter(user -> user.getName() != null)
.map(user -> user.getName() + "_" + user.getJobnumber())
.collect(Collectors.toList());
}
if (Objects.nonNull(openingOperationPlanDO)) {
openingOperationPlanVO = new OpeningOperationPlanVO(openingOperationPlanDO);
openingOperationPlanVO.setSubmiter(userInfoById.getName()+"_"+userInfoById.getJobnumber());
openingOperationPlanVO.setApprover(collect.stream().collect(Collectors.joining(",")));
openingOperationPlanVO.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()+"_"+userInfoById.getJobnumber());
openingOperationPlanVO.setApprover(CollectionUtils.isEmpty(collect) ? null : collect.stream().collect(Collectors.joining(",")));
String preparationUserIds = openingOperationPlanDO.getPreparationUserIds();
List<String> stream = Arrays.stream(preparationUserIds.split(CommonConstants.COMMA)).collect(Collectors.toList());
List<UserNameDTO> nameByUserId = enterpriseUserDAO.getNameByUserId(stream);
@@ -133,8 +139,8 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
openingOperationPlanVO.setShopName(shopInfo.getShopName());
return openingOperationPlanVO;
}
openingOperationPlanVO.setSubmiter(userInfoById.getName()+"_"+userInfoById.getJobnumber());
openingOperationPlanVO.setApprover(collect.stream().collect(Collectors.joining(",")));
openingOperationPlanVO.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()+"_"+userInfoById.getJobnumber());
openingOperationPlanVO.setApprover(CollectionUtils.isEmpty(collect) ? null : collect.stream().collect(Collectors.joining(",")));
return openingOperationPlanVO;
}

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
View File

@@ -939,7 +939,7 @@ public class PointServiceImpl implements PointService {
ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(rentContract.getShopId());
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId());
EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoById(lineInfo.getDevelopmentManager());
result.setApprover(enterpriseUserDO.getName()+"_"+enterpriseUserDO.getJobnumber());
result.setApprover(Objects.isNull(enterpriseUserDO) ? null : enterpriseUserDO.getName()+"_"+enterpriseUserDO.getJobnumber());
return result;
}