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

fix 选址专员全部显示

Browse Source
This commit is contained in:
shuo.wang
2025-02-24 13:57:19 +08:00
parent 555654e5c9
commit c97c5ab5c2
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
View File

@@ -103,13 +103,15 @@ public class LineServiceImpl implements LineService {
List<ShopInfoDO> shopInfoDOS = shopInfoDAO.selectInvestmentByLines(Collections.singletonList(lineInfo.getId()));
Set<String> userIds = shopInfoDOS.stream().map(ShopInfoDO::getInvestmentManager).collect(Collectors.toSet());
Set<String> developmentMserIds = shopInfoDOS.stream().map(ShopInfoDO::getDevelopmentManager).collect(Collectors.toSet());
userIds.add(lineInfo.getInvestmentManager());
userIds.addAll(developmentMserIds);
Map<String, String> userNameMap = enterpriseUserDAO.getUserNameMap(new ArrayList<>(userIds));
StringBuilder investmentManagerName = new StringBuilder();
for (String userId : userNameMap.keySet()) {
for (String userId : userIds) {
investmentManagerName.append(userNameMap.get(userId)).append(",");
}
result.setInvestmentManagerName(investmentManagerName.toString().substring(0, investmentManagerName.length() - 1));
result.setInvestmentManagerName(investmentManagerName.substring(0, investmentManagerName.length() - 1));
// if (StringUtil.isNotEmpty(lineInfo.getInvestmentManager())){
// EnterpriseUserDO user = enterpriseUserDAO.getUserInfoById(lineInfo.getInvestmentManager());
// result.setInvestmentManagerName(user.getName());
@@ -140,6 +142,11 @@ public class LineServiceImpl implements LineService {
result.setJoinType(qualificationsInfoDO.getJoinType());
}
BeanUtil.copyProperties(lineInfo, result);
StringBuilder developmentManagerName = new StringBuilder();
for (String userId : developmentMserIds) {
developmentManagerName.append(userNameMap.get(userId)).append(",");
}
result.setDevelopmentManager(investmentManagerName.substring(0, investmentManagerName.length() - 1));
return result;
}
@@ -261,7 +268,10 @@ public class LineServiceImpl implements LineService {
List<Long> lineIds = lineInfoDOS.stream().map(LineInfoDO::getId).collect(Collectors.toList());
List<ShopInfoDO> shopInfoDOS = shopInfoDAO.selectInvestmentByLines(lineIds);
Map<Long, Set<String>> investmentManagerIdMapByLineId = shopInfoDOS.stream().collect(Collectors.groupingBy(ShopInfoDO::getLineId, Collectors.mapping(ShopInfoDO::getInvestmentManager, Collectors.toSet())));
Map<Long, Set<String>> developmentManagerMap = shopInfoDOS.stream().collect(Collectors.groupingBy(ShopInfoDO::getLineId, Collectors.mapping(ShopInfoDO::getDevelopmentManager, Collectors.toSet())));
Set<String> investmentManagerIds = shopInfoDOS.stream().map(ShopInfoDO::getInvestmentManager).collect(Collectors.toSet());
Set<String> developmentManagerIds = shopInfoDOS.stream().map(ShopInfoDO::getInvestmentManager).collect(Collectors.toSet());
Map<Long, HyPartnerLabelDO> userPortraitMap = deskService.getUserPortraitMap(lineInfoDOS);
List<Long> wantShopAreaIdList = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList());
Map<Long, String> wantShopAreaMap = hyOpenAreaInfoDAO.selectNameMapByIds(wantShopAreaIdList);
@@ -272,6 +282,7 @@ public class LineServiceImpl implements LineService {
userIds.addAll(lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getDevelopmentManager() != null).map(LineInfoDO::getDevelopmentManager).collect(Collectors.toList()));
userIds.addAll(lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getUpdateUserId() != null).map(LineInfoDO::getUpdateUserId).collect(Collectors.toList()));
userIds.addAll(investmentManagerIds);
userIds.addAll(developmentManagerIds);
Map<String, String> userNameMap = enterpriseUserDAO.getUserNameMap(new ArrayList<>(userIds));
List<SigningBaseInfoDO> signingBaseInfoDOS = intentAgreementMapper.selectByLineIds(lineIds);
@@ -296,14 +307,20 @@ public class LineServiceImpl implements LineService {
for (String s : userIdSet) {
investmentManagerUserName.append(userNameMap.get(s)).append(",");
}
StringBuilder developmentManagerUserName = new StringBuilder();
Set<String> developmentManagerIdsSet = developmentManagerMap.getOrDefault(x.getId(), new HashSet<>());
developmentManagerIdsSet.add(x.getDevelopmentManager());
for (String s : developmentManagerIdsSet) {
developmentManagerUserName.append(userNameMap.get(s)).append(",");
}
partnerListVO.setUpdateTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, x.getUpdateTime()));
partnerListVO.setLineSourceName(channelMapByIds.get(x.getLineSource()));
partnerListVO.setJoinStatus(x.getJoinStatus());
partnerListVO.setJoinMode(x.getJoinMode());
partnerListVO.setPartnerNum(x.getPartnerNum());
partnerListVO.setInvestmentManagerUserName(investmentManagerUserName.toString().substring(0, investmentManagerUserName.length() - 1));
partnerListVO.setInvestmentManagerUserName(investmentManagerUserName.substring(0, investmentManagerUserName.length() - 1));
partnerListVO.setUpdateUserName(userNameMap.get(x.getUpdateUserId()));
partnerListVO.setDevelopmentManagerUserName(userNameMap.get(x.getDevelopmentManager()));
partnerListVO.setDevelopmentManagerUserName(developmentManagerUserName.substring(0, developmentManagerUserName.length() - 1));
partnerListVO.setWantShopNum(x.getWantShopNum());
result.add(partnerListVO);
});

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

@@ -273,6 +273,9 @@ public class PointServiceImpl implements PointService {
throw new ServiceException(ErrorCodeEnum.POINT_AUDIT_NOT_SETTING);
}
List<AuditNodeDTO> auditNode = dealAuditNode(auditSetting, pointInfo.getRegionId(), pointInfo.getDevelopmentManager());
if(auditNode.size()==CommonConstants.ONE){
updatePoint.setPointStatus(PointStatusEnum.POINT_STATUS_5.getCode());
}
//获取审批节点上的数据
List<PointAuditRecordDO> recordList = AuditNodeDTO.convertDO(pointId, submitAuditCount, auditNode);
pointAuditRecordDAO.addPointAuditRecord(recordList);
@@ -1108,6 +1111,7 @@ public class PointServiceImpl implements PointService {
Map<String, List<String>> userIdsMap = userAuthMappingService.getUserIdByRoleIdAndRegionId(roleIds, regionId);
List<String> firstApprovalUserIds = getUserIdsByPositionIds(firstApproval, userIdsMap);
resultList.add(new AuditNodeDTO(NodeNoEnum.NODE_NO_0.getCode(), PointAuditRecordDO.SUBMIT_TASK, Boolean.FALSE, Arrays.asList(developmentManager)));
//todo 缺少兜底人
if(CollectionUtils.isNotEmpty(firstApprovalUserIds)){
resultList.add(new AuditNodeDTO(NodeNoEnum.NODE_NO_1.getCode(), PointAuditRecordDO.RECEIVE_TASK, Boolean.TRUE, firstApprovalUserIds));
}