diff --git a/jnpf-tendering-biz/src/main/java/jnpf/service/impl/BiddingProjectSubscribeServiceImpl.java b/jnpf-tendering-biz/src/main/java/jnpf/service/impl/BiddingProjectSubscribeServiceImpl.java index 78131bf..1bc2717 100644 --- a/jnpf-tendering-biz/src/main/java/jnpf/service/impl/BiddingProjectSubscribeServiceImpl.java +++ b/jnpf-tendering-biz/src/main/java/jnpf/service/impl/BiddingProjectSubscribeServiceImpl.java @@ -208,10 +208,10 @@ public class BiddingProjectSubscribeServiceImpl extends ServiceImpl userEntityList = querySuperiorLeader(userEntity); //添加根子单数据 OrganizeEntity organization = organizeService.getInfoById(userEntity.getOrganizeId()); String hierarchy = checkOrganizationHierarchy(userEntity); @@ -738,39 +739,42 @@ public class BiddingProjectSubscribeServiceImpl extends ServiceImpl querySuperiorLeader(UserEntity userEntity) { //查询上级组织 OrganizeEntity currentOrganization = organizeService.getInfoById(userEntity.getOrganizeId()); //校验是否为公司 @@ -852,17 +856,20 @@ public class BiddingProjectSubscribeServiceImpl extends ServiceImpl leaderId = userRelationService.getListByUserIdAll(userIdList) + List list = userRelationService.getListByUserIdAll(userIdList) .stream() .filter(userRelationEntity -> userRelationEntity.getObjectType().equals(PermissionConst.ROLE)) .filter(userRelationEntity -> shyRole.get().getId().equals(userRelationEntity.getObjectId())) - .map(UserRelationEntity::getUserId) - .findFirst(); - if (!leaderId.isPresent()) { + .map(UserRelationEntity::getUserId).collect(Collectors.toList()); + if (CollectionUtil.isEmpty(list)) { throw new DataException("该人员上级无领导"); } + List userEntityList = new ArrayList<>(); + for (String userId : list) { + userEntityList.add(userService.getInfoById(userId)); + } //查询领导详情 - return userService.getInfoById(leaderId.get()); + return userEntityList; } @Override @@ -882,7 +889,7 @@ public class BiddingProjectSubscribeServiceImpl extends ServiceImpl userEntityList = querySuperiorLeader(userService.getInfoById(userInfo.getUserId())); + + for (UserEntity leader : userEntityList) { + //领导的待归档 + BiddingProjectSubscribeChild build = BiddingProjectSubscribeChild.builder() + .childStatus(BiddingProjectEnum.ChildStatusEnum.TO_BE_ARCHIVED.getCode()) + .childStatusName(BiddingProjectEnum.ChildStatusEnum.TO_BE_ARCHIVED.getDescribe()) + .childId(UUID.randomUUID().toString().replace("-", "")) + .mainId(biddingProjectSubscribeEntity.getId().toString()) + .rootChildFlag(BiddingProjectEnum.RootFlagEnum.NOT_ROOT_FLAG.getCode()) + .userName(leader.getRealName()) + .userId(leader.getId()) + .userDeptId(leader.getOrganizeId()) + .userDeptName(organizeService.getInfoById(leader.getOrganizeId()).getFullName()) + .createTime(LocalDateTime.now()) + .createUserName(userInfo.getUserName()) + .createUserId(userInfo.getUserId()) + .updateTime(LocalDateTime.now()) + .build(); + iBiddingProjectSubscribeChildService.saveOrUpdate(build); + } + } else { //审批领导状态改为已审批 @@ -1294,24 +1326,35 @@ public class BiddingProjectSubscribeServiceImpl extends ServiceImpl userEntityList = getFirstLeader(userService.getInfoById(userInfo.getUserId())); + for (UserEntity leader : userEntityList) { + //领导的待归档 + BiddingProjectSubscribeChild build = BiddingProjectSubscribeChild.builder() + .childStatus(BiddingProjectEnum.ChildStatusEnum.TO_BE_ARCHIVED.getCode()) + .childStatusName(BiddingProjectEnum.ChildStatusEnum.TO_BE_ARCHIVED.getDescribe()) + .childId(UUID.randomUUID().toString().replace("-", "")) + .mainId(biddingProjectSubscribeEntity.getId().toString()) + .rootChildFlag(BiddingProjectEnum.RootFlagEnum.NOT_ROOT_FLAG.getCode()) + .userName(leader.getRealName()) + .userId(leader.getId()) + .userDeptId(leader.getOrganizeId()) + .userDeptName(organizeService.getInfoById(leader.getOrganizeId()).getFullName()) + .createTime(LocalDateTime.now()) + .createUserName(userInfo.getUserName()) + .createUserId(userInfo.getUserId()) + .updateTime(LocalDateTime.now()) + .build(); + iBiddingProjectSubscribeChildService.saveOrUpdate(build); + } + } else { //审批领导状态改为已审批 @@ -1323,6 +1366,13 @@ public class BiddingProjectSubscribeServiceImpl extends ServiceImpl rootChild = iBiddingProjectSubscribeChildService.lambdaQuery() .eq(BiddingProjectSubscribeChild::getMainId, biddingProjectSubscribeEntity.getId()) .eq(BiddingProjectSubscribeChild::getRootChildFlag, BiddingProjectEnum.RootFlagEnum.ROOT_FLAG.getCode()) .list().stream().findFirst(); - if (rootChild.isPresent()){ + if (rootChild.isPresent()) { log.info("添加到抽签表ing..."); LotteryProject lotteryProject = BeanUtil.copyProperties(rootChild.get(), LotteryProject.class); lotteryProject.setCreateId(rootChild.get().getCreateUserId()); @@ -1381,7 +1438,7 @@ public class BiddingProjectSubscribeServiceImpl extends ServiceImpl getFirstLeader(UserEntity userEntity) { +// UserEntity leader = querySuperiorLeader(userEntity); + List userEntityList = querySuperiorLeader(userEntity); + UserEntity leaderInfo = userEntityList.stream().findFirst().get(); + if (!StrUtil.equals("1", checkOrganizationHierarchy(leaderInfo))) { + getFirstLeader(leaderInfo); } - return leader; + + return userEntityList; } @@ -1496,11 +1556,11 @@ public class BiddingProjectSubscribeServiceImpl extends ServiceImpl