yangzl.bw
/
jnpf_tendering
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

yangzhenli
V26772074 1 year ago
parent
8caafbd49d
commit
c4c736e850
1 changed files with 153 additions and 93 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. 246
      jnpf-tendering-biz/src/main/java/jnpf/service/impl/BiddingProjectSubscribeServiceImpl.java

246
jnpf-tendering-biz/src/main/java/jnpf/service/impl/BiddingProjectSubscribeServiceImpl.java
Unescape View File

@ -208,10 +208,10 @@ public class BiddingProjectSubscribeServiceImpl extends ServiceImpl<BiddingProje
} }
if(ObjectUtil.isNotEmpty(biddingProjectSubscribePagination.getProjectName())){ if (ObjectUtil.isNotEmpty(biddingProjectSubscribePagination.getProjectName())) {
bidding_project_subscribeNum++; bidding_project_subscribeNum++;
bidding_project_subscribeQueryWrapper.lambda().like(BiddingProjectSubscribeEntity::getProjectName,biddingProjectSubscribePagination.getProjectName()); bidding_project_subscribeQueryWrapper.lambda().like(BiddingProjectSubscribeEntity::getProjectName, biddingProjectSubscribePagination.getProjectName());
} }
@ -691,7 +691,8 @@ public class BiddingProjectSubscribeServiceImpl extends ServiceImpl<BiddingProje
@Override @Override
public void updateFlow(UserEntity userEntity, BiddingProjectSubscribeEntity entity, Boolean add) { public void updateFlow(UserEntity userEntity, BiddingProjectSubscribeEntity entity, Boolean add) {
UserEntity leaderInfo = querySuperiorLeader(userEntity); // UserEntity leaderInfo = querySuperiorLeader(userEntity);
List<UserEntity> userEntityList = querySuperiorLeader(userEntity);
//添加根子单数据 //添加根子单数据
OrganizeEntity organization = organizeService.getInfoById(userEntity.getOrganizeId()); OrganizeEntity organization = organizeService.getInfoById(userEntity.getOrganizeId());
String hierarchy = checkOrganizationHierarchy(userEntity); String hierarchy = checkOrganizationHierarchy(userEntity);
@ -738,39 +739,42 @@ public class BiddingProjectSubscribeServiceImpl extends ServiceImpl<BiddingProje
} }
} }
//添加子单数据即派单到上级领导 for (UserEntity leaderInfo : userEntityList) {
BiddingProjectSubscribeChild build = BiddingProjectSubscribeChild.builder() //添加子单数据即派单到上级领导
.childId(UUID.randomUUID().toString().replace("-", "")) BiddingProjectSubscribeChild build = BiddingProjectSubscribeChild.builder()
.mainId(entity.getId().toString()) .childId(UUID.randomUUID().toString().replace("-", ""))
.userDeptId(leaderInfo.getOrganizeId()) .mainId(entity.getId().toString())
.userDeptName(organizeService.getInfoById(leaderInfo.getOrganizeId()).getFullName()) .userDeptId(leaderInfo.getOrganizeId())
.userId(leaderInfo.getId()) .userDeptName(organizeService.getInfoById(leaderInfo.getOrganizeId()).getFullName())
.userName(leaderInfo.getRealName()) .userId(leaderInfo.getId())
.childStatus(BiddingProjectEnum.ChildStatusEnum.PENDING_REVIEW.getCode()) .userName(leaderInfo.getRealName())
.childStatusName(BiddingProjectEnum.ChildStatusEnum.PENDING_REVIEW.getDescribe()) .childStatus(BiddingProjectEnum.ChildStatusEnum.PENDING_REVIEW.getCode())
.rootChildFlag(BiddingProjectEnum.RootFlagEnum.NOT_ROOT_FLAG.getCode()) .childStatusName(BiddingProjectEnum.ChildStatusEnum.PENDING_REVIEW.getDescribe())
.createTime(LocalDateTime.now()) .rootChildFlag(BiddingProjectEnum.RootFlagEnum.NOT_ROOT_FLAG.getCode())
.updateTime(LocalDateTime.now()) .createTime(LocalDateTime.now())
.createUserName(userEntity.getRealName()) .updateTime(LocalDateTime.now())
.createUserId(userEntity.getId()) .createUserName(userEntity.getRealName())
.build(); .createUserId(userEntity.getId())
iBiddingProjectSubscribeChildService.saveOrUpdate(build); .build();
iBiddingProjectSubscribeChildService.saveOrUpdate(build);
//添加步骤数据
iBiddingProjectSubscribeStepService.saveOrUpdate(BiddingProjectSubscribeStep.builder()
.relationMainId(entity.getId().toString())
.relationType(BiddingProjectEnum.StepRelationTypeEnum.BIDDING.getCode())
.dealType(BiddingProjectEnum.StepTypeEnum.AUTOMATIC_DISPATCH.getCode())
.dealTypeName(BiddingProjectEnum.StepTypeEnum.AUTOMATIC_DISPATCH.getDescribe())
.relationChildId(build.getChildId())
.remake("系统自动流转至" + leaderInfo.getRealName())
.createOrganizationId(userEntity.getOrganizeId())
.createOrganizationName(fullName)
.createUserId(userEntity.getId())
.createUserName(userEntity.getRealName())
.createTime(LocalDateTime.now())
.build()
);
}
//添加步骤数据
iBiddingProjectSubscribeStepService.saveOrUpdate(BiddingProjectSubscribeStep.builder()
.relationMainId(entity.getId().toString())
.relationType(BiddingProjectEnum.StepRelationTypeEnum.BIDDING.getCode())
.dealType(BiddingProjectEnum.StepTypeEnum.AUTOMATIC_DISPATCH.getCode())
.dealTypeName(BiddingProjectEnum.StepTypeEnum.AUTOMATIC_DISPATCH.getDescribe())
.relationChildId(build.getChildId())
.remake("系统自动流转至" + leaderInfo.getRealName())
.createOrganizationId(userEntity.getOrganizeId())
.createOrganizationName(fullName)
.createUserId(userEntity.getId())
.createUserName(userEntity.getRealName())
.createTime(LocalDateTime.now())
.build()
);
BiddingProjectEnum.MainStatusEnum mainStatusEnum = null; BiddingProjectEnum.MainStatusEnum mainStatusEnum = null;
switch (hierarchy) { switch (hierarchy) {
case "1": case "1":
@ -813,7 +817,7 @@ public class BiddingProjectSubscribeServiceImpl extends ServiceImpl<BiddingProje
// return "3"; // return "3";
} }
private UserEntity querySuperiorLeader(UserEntity userEntity) { private List<UserEntity> querySuperiorLeader(UserEntity userEntity) {
//查询上级组织 //查询上级组织
OrganizeEntity currentOrganization = organizeService.getInfoById(userEntity.getOrganizeId()); OrganizeEntity currentOrganization = organizeService.getInfoById(userEntity.getOrganizeId());
//校验是否为公司 //校验是否为公司
@ -852,17 +856,20 @@ public class BiddingProjectSubscribeServiceImpl extends ServiceImpl<BiddingProje
if (!shyRole.isPresent()) { if (!shyRole.isPresent()) {
throw new DataException("数据错误，请联系管理员[1]"); throw new DataException("数据错误，请联系管理员[1]");
} }
Optional<String> leaderId = userRelationService.getListByUserIdAll(userIdList) List<String> list = userRelationService.getListByUserIdAll(userIdList)
.stream() .stream()
.filter(userRelationEntity -> userRelationEntity.getObjectType().equals(PermissionConst.ROLE)) .filter(userRelationEntity -> userRelationEntity.getObjectType().equals(PermissionConst.ROLE))
.filter(userRelationEntity -> shyRole.get().getId().equals(userRelationEntity.getObjectId())) .filter(userRelationEntity -> shyRole.get().getId().equals(userRelationEntity.getObjectId()))
.map(UserRelationEntity::getUserId) .map(UserRelationEntity::getUserId).collect(Collectors.toList());
.findFirst(); if (CollectionUtil.isEmpty(list)) {
if (!leaderId.isPresent()) {
throw new DataException("该人员上级无领导"); throw new DataException("该人员上级无领导");
} }
List<UserEntity> userEntityList = new ArrayList<>();
for (String userId : list) {
userEntityList.add(userService.getInfoById(userId));
}
//查询领导详情 //查询领导详情
return userService.getInfoById(leaderId.get()); return userEntityList;
} }
@Override @Override
@ -882,7 +889,7 @@ public class BiddingProjectSubscribeServiceImpl extends ServiceImpl<BiddingProje
if (iBiddingProjectSubscribeChildService.lambdaQuery() if (iBiddingProjectSubscribeChildService.lambdaQuery()
.eq(BiddingProjectSubscribeChild::getMainId, param.getId()) .eq(BiddingProjectSubscribeChild::getMainId, param.getId())
.eq(BiddingProjectSubscribeChild::getChildStatus, BiddingProjectEnum.ChildStatusEnum.TO_BE_SUBMITTED.getCode()) .eq(BiddingProjectSubscribeChild::getChildStatus, BiddingProjectEnum.ChildStatusEnum.TO_BE_SUBMITTED.getCode())
.exists()){ .exists()) {
throw new DataException("存在未提交的子项，不能审核"); throw new DataException("存在未提交的子项，不能审核");
} }
@ -986,6 +993,13 @@ public class BiddingProjectSubscribeServiceImpl extends ServiceImpl<BiddingProje
.set(BiddingProjectSubscribeChild::getUpdateTime, LocalDateTime.now()) .set(BiddingProjectSubscribeChild::getUpdateTime, LocalDateTime.now())
.eq(BiddingProjectSubscribeChild::getChildId, selfChild.getChildId()) .eq(BiddingProjectSubscribeChild::getChildId, selfChild.getChildId())
.update(); .update();
//将其他待审批子单删除
iBiddingProjectSubscribeChildService.lambdaUpdate()
//提交人状态设为待提交
.eq(BiddingProjectSubscribeChild::getChildStatus, selfChild.getChildStatus())
.eq(BiddingProjectSubscribeChild::getMainId, biddingProjectSubscribeEntity.getId())
.ne(BiddingProjectSubscribeChild::getChildId, selfChild.getChildId())
.remove();
//修改主状态 //修改主状态
this.lambdaUpdate() this.lambdaUpdate()
.set(BiddingProjectSubscribeEntity::getMainStatus, BiddingProjectEnum.MainStatusEnum.RETURNED.getCode()) .set(BiddingProjectSubscribeEntity::getMainStatus, BiddingProjectEnum.MainStatusEnum.RETURNED.getCode())
@ -1166,13 +1180,19 @@ public class BiddingProjectSubscribeServiceImpl extends ServiceImpl<BiddingProje
updateFlow(userService.getInfoById(userInfo.getUserId()), biddingProjectSubscribeEntity, false); updateFlow(userService.getInfoById(userInfo.getUserId()), biddingProjectSubscribeEntity, false);
//审批领导状态改为已审批 //审批领导状态改为已审批
iBiddingProjectSubscribeChildService.lambdaUpdate() iBiddingProjectSubscribeChildService.lambdaUpdate()
//提交人状态设为待提交
.set(BiddingProjectSubscribeChild::getChildStatus, BiddingProjectEnum.ChildStatusEnum.PASS.getCode()) .set(BiddingProjectSubscribeChild::getChildStatus, BiddingProjectEnum.ChildStatusEnum.PASS.getCode())
.set(BiddingProjectSubscribeChild::getChildStatusName, BiddingProjectEnum.ChildStatusEnum.PASS.getDescribe()) .set(BiddingProjectSubscribeChild::getChildStatusName, BiddingProjectEnum.ChildStatusEnum.PASS.getDescribe())
.set(BiddingProjectSubscribeChild::getRemake, param.getRemake()) .set(BiddingProjectSubscribeChild::getRemake, param.getRemake())
.set(BiddingProjectSubscribeChild::getUpdateTime, LocalDateTime.now()) .set(BiddingProjectSubscribeChild::getUpdateTime, LocalDateTime.now())
.eq(BiddingProjectSubscribeChild::getChildId, selfChild.getChildId()) .eq(BiddingProjectSubscribeChild::getChildId, selfChild.getChildId())
.update(); .update();
//将其他待审批子单删除
iBiddingProjectSubscribeChildService.lambdaUpdate()
//提交人状态设为待提交
.eq(BiddingProjectSubscribeChild::getChildStatus, selfChild.getChildStatus())
.eq(BiddingProjectSubscribeChild::getMainId, biddingProjectSubscribeEntity.getId())
.ne(BiddingProjectSubscribeChild::getChildId, selfChild.getChildId())
.remove();
} }
} }
break; break;
@ -1195,6 +1215,13 @@ public class BiddingProjectSubscribeServiceImpl extends ServiceImpl<BiddingProje
.set(BiddingProjectSubscribeChild::getUpdateTime, LocalDateTime.now()) .set(BiddingProjectSubscribeChild::getUpdateTime, LocalDateTime.now())
.eq(BiddingProjectSubscribeChild::getChildId, selfChild.getChildId()) .eq(BiddingProjectSubscribeChild::getChildId, selfChild.getChildId())
.update(); .update();
//将其他待审批子单删除
iBiddingProjectSubscribeChildService.lambdaUpdate()
//提交人状态设为待提交
.eq(BiddingProjectSubscribeChild::getChildStatus, selfChild.getChildStatus())
.eq(BiddingProjectSubscribeChild::getMainId, biddingProjectSubscribeEntity.getId())
.ne(BiddingProjectSubscribeChild::getChildId, selfChild.getChildId())
.remove();
} }
} }
@ -1225,24 +1252,29 @@ public class BiddingProjectSubscribeServiceImpl extends ServiceImpl<BiddingProje
.set(BiddingProjectSubscribeChild::getUpdateTime, LocalDateTime.now()) .set(BiddingProjectSubscribeChild::getUpdateTime, LocalDateTime.now())
.eq(BiddingProjectSubscribeChild::getChildId, selfChild.getChildId()) .eq(BiddingProjectSubscribeChild::getChildId, selfChild.getChildId())
.update(); .update();
UserEntity leader = querySuperiorLeader(userService.getInfoById(userInfo.getUserId())); // UserEntity leader = querySuperiorLeader(userService.getInfoById(userInfo.getUserId()));
//领导的待归档 List<UserEntity> userEntityList = querySuperiorLeader(userService.getInfoById(userInfo.getUserId()));
BiddingProjectSubscribeChild build = BiddingProjectSubscribeChild.builder()
.childStatus(BiddingProjectEnum.ChildStatusEnum.TO_BE_ARCHIVED.getCode()) for (UserEntity leader : userEntityList) {
.childStatusName(BiddingProjectEnum.ChildStatusEnum.TO_BE_ARCHIVED.getDescribe()) //领导的待归档
.childId(UUID.randomUUID().toString().replace("-", "")) BiddingProjectSubscribeChild build = BiddingProjectSubscribeChild.builder()
.mainId(biddingProjectSubscribeEntity.getId().toString()) .childStatus(BiddingProjectEnum.ChildStatusEnum.TO_BE_ARCHIVED.getCode())
.rootChildFlag(BiddingProjectEnum.RootFlagEnum.NOT_ROOT_FLAG.getCode()) .childStatusName(BiddingProjectEnum.ChildStatusEnum.TO_BE_ARCHIVED.getDescribe())
.userName(leader.getRealName()) .childId(UUID.randomUUID().toString().replace("-", ""))
.userId(leader.getId()) .mainId(biddingProjectSubscribeEntity.getId().toString())
.userDeptId(leader.getOrganizeId()) .rootChildFlag(BiddingProjectEnum.RootFlagEnum.NOT_ROOT_FLAG.getCode())
.userDeptName(organizeService.getInfoById(leader.getOrganizeId()).getFullName()) .userName(leader.getRealName())
.createTime(LocalDateTime.now()) .userId(leader.getId())
.createUserName(userInfo.getUserName()) .userDeptId(leader.getOrganizeId())
.createUserId(userInfo.getUserId()) .userDeptName(organizeService.getInfoById(leader.getOrganizeId()).getFullName())
.updateTime(LocalDateTime.now()) .createTime(LocalDateTime.now())
.build(); .createUserName(userInfo.getUserName())
iBiddingProjectSubscribeChildService.saveOrUpdate(build); .createUserId(userInfo.getUserId())
.updateTime(LocalDateTime.now())
.build();
iBiddingProjectSubscribeChildService.saveOrUpdate(build);
}
} else { } else {
//审批领导状态改为已审批 //审批领导状态改为已审批
@ -1294,24 +1326,35 @@ public class BiddingProjectSubscribeServiceImpl extends ServiceImpl<BiddingProje
.set(BiddingProjectSubscribeChild::getUpdateTime, LocalDateTime.now()) .set(BiddingProjectSubscribeChild::getUpdateTime, LocalDateTime.now())
.eq(BiddingProjectSubscribeChild::getChildId, selfChild.getChildId()) .eq(BiddingProjectSubscribeChild::getChildId, selfChild.getChildId())
.update(); .update();
UserEntity leader = getFirstLeader(userService.getInfoById(userInfo.getUserId())); //将其他待审批子单删除
//领导的待归档 iBiddingProjectSubscribeChildService.lambdaUpdate()
BiddingProjectSubscribeChild build = BiddingProjectSubscribeChild.builder() //提交人状态设为待提交
.childStatus(BiddingProjectEnum.ChildStatusEnum.TO_BE_ARCHIVED.getCode()) .eq(BiddingProjectSubscribeChild::getChildStatus, selfChild.getChildStatus())
.childStatusName(BiddingProjectEnum.ChildStatusEnum.TO_BE_ARCHIVED.getDescribe()) .eq(BiddingProjectSubscribeChild::getMainId, biddingProjectSubscribeEntity.getId())
.childId(UUID.randomUUID().toString().replace("-", "")) .ne(BiddingProjectSubscribeChild::getChildId, selfChild.getChildId())
.mainId(biddingProjectSubscribeEntity.getId().toString()) .remove();
.rootChildFlag(BiddingProjectEnum.RootFlagEnum.NOT_ROOT_FLAG.getCode()) // UserEntity leader = getFirstLeader(userService.getInfoById(userInfo.getUserId()));
.userName(leader.getRealName()) List<UserEntity> userEntityList = getFirstLeader(userService.getInfoById(userInfo.getUserId()));
.userId(leader.getId()) for (UserEntity leader : userEntityList) {
.userDeptId(leader.getOrganizeId()) //领导的待归档
.userDeptName(organizeService.getInfoById(leader.getOrganizeId()).getFullName()) BiddingProjectSubscribeChild build = BiddingProjectSubscribeChild.builder()
.createTime(LocalDateTime.now()) .childStatus(BiddingProjectEnum.ChildStatusEnum.TO_BE_ARCHIVED.getCode())
.createUserName(userInfo.getUserName()) .childStatusName(BiddingProjectEnum.ChildStatusEnum.TO_BE_ARCHIVED.getDescribe())
.createUserId(userInfo.getUserId()) .childId(UUID.randomUUID().toString().replace("-", ""))
.updateTime(LocalDateTime.now()) .mainId(biddingProjectSubscribeEntity.getId().toString())
.build(); .rootChildFlag(BiddingProjectEnum.RootFlagEnum.NOT_ROOT_FLAG.getCode())
iBiddingProjectSubscribeChildService.saveOrUpdate(build); .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 { } else {
//审批领导状态改为已审批 //审批领导状态改为已审批
@ -1323,6 +1366,13 @@ public class BiddingProjectSubscribeServiceImpl extends ServiceImpl<BiddingProje
.set(BiddingProjectSubscribeChild::getUpdateTime, LocalDateTime.now()) .set(BiddingProjectSubscribeChild::getUpdateTime, LocalDateTime.now())
.eq(BiddingProjectSubscribeChild::getChildId, selfChild.getChildId()) .eq(BiddingProjectSubscribeChild::getChildId, selfChild.getChildId())
.update(); .update();
//将其他待审批子单删除
iBiddingProjectSubscribeChildService.lambdaUpdate()
//提交人状态设为待提交
.eq(BiddingProjectSubscribeChild::getChildStatus, selfChild.getChildStatus())
.eq(BiddingProjectSubscribeChild::getMainId, biddingProjectSubscribeEntity.getId())
.ne(BiddingProjectSubscribeChild::getChildId, selfChild.getChildId())
.remove();
} }
} else { } else {
//审批类型审核通过去上传招标结果,添加子单到提交人 用于查询 //审批类型审核通过去上传招标结果,添加子单到提交人 用于查询
@ -1362,13 +1412,20 @@ public class BiddingProjectSubscribeServiceImpl extends ServiceImpl<BiddingProje
.set(BiddingProjectSubscribeChild::getUpdateTime, LocalDateTime.now()) .set(BiddingProjectSubscribeChild::getUpdateTime, LocalDateTime.now())
.eq(BiddingProjectSubscribeChild::getChildId, selfChild.getChildId()) .eq(BiddingProjectSubscribeChild::getChildId, selfChild.getChildId())
.update(); .update();
//将其他待审批子单删除
iBiddingProjectSubscribeChildService.lambdaUpdate()
//提交人状态设为待提交
.eq(BiddingProjectSubscribeChild::getChildStatus, selfChild.getChildStatus())
.eq(BiddingProjectSubscribeChild::getMainId, biddingProjectSubscribeEntity.getId())
.ne(BiddingProjectSubscribeChild::getChildId, selfChild.getChildId())
.remove();
//todo 审批通过添加到抽签表中 //todo 审批通过添加到抽签表中
//查询根子单 //查询根子单
Optional<BiddingProjectSubscribeChild> rootChild = iBiddingProjectSubscribeChildService.lambdaQuery() Optional<BiddingProjectSubscribeChild> rootChild = iBiddingProjectSubscribeChildService.lambdaQuery()
.eq(BiddingProjectSubscribeChild::getMainId, biddingProjectSubscribeEntity.getId()) .eq(BiddingProjectSubscribeChild::getMainId, biddingProjectSubscribeEntity.getId())
.eq(BiddingProjectSubscribeChild::getRootChildFlag, BiddingProjectEnum.RootFlagEnum.ROOT_FLAG.getCode()) .eq(BiddingProjectSubscribeChild::getRootChildFlag, BiddingProjectEnum.RootFlagEnum.ROOT_FLAG.getCode())
.list().stream().findFirst(); .list().stream().findFirst();
if (rootChild.isPresent()){ if (rootChild.isPresent()) {
log.info("添加到抽签表ing..."); log.info("添加到抽签表ing...");
LotteryProject lotteryProject = BeanUtil.copyProperties(rootChild.get(), LotteryProject.class); LotteryProject lotteryProject = BeanUtil.copyProperties(rootChild.get(), LotteryProject.class);
lotteryProject.setCreateId(rootChild.get().getCreateUserId()); lotteryProject.setCreateId(rootChild.get().getCreateUserId());
@ -1381,7 +1438,7 @@ public class BiddingProjectSubscribeServiceImpl extends ServiceImpl<BiddingProje
lotteryProject.setProjectNumber(biddingProjectSubscribeEntity.getProjectNumber()); lotteryProject.setProjectNumber(biddingProjectSubscribeEntity.getProjectNumber());
lotteryProject.setProjectName(biddingProjectSubscribeEntity.getProjectName()); lotteryProject.setProjectName(biddingProjectSubscribeEntity.getProjectName());
Date bidOpeningTime = biddingProjectSubscribeEntity.getBidOpeningTime(); Date bidOpeningTime = biddingProjectSubscribeEntity.getBidOpeningTime();
if (null!=bidOpeningTime) { if (null != bidOpeningTime) {
String format = cn.hutool.core.date.DateUtil.format(bidOpeningTime, "yyyy-MM-dd HH:mm:ss"); String format = cn.hutool.core.date.DateUtil.format(bidOpeningTime, "yyyy-MM-dd HH:mm:ss");
lotteryProject.setBidOpeningTime(LocalDate.parse(format)); lotteryProject.setBidOpeningTime(LocalDate.parse(format));
lotteryProject.setBidEvaluationTime(LocalDateTime.parse(format)); lotteryProject.setBidEvaluationTime(LocalDateTime.parse(format));
@ -1416,12 +1473,15 @@ public class BiddingProjectSubscribeServiceImpl extends ServiceImpl<BiddingProje
iBiddingProjectSubscribeStepService.saveOrUpdate(step); iBiddingProjectSubscribeStepService.saveOrUpdate(step);
} }
private UserEntity getFirstLeader(UserEntity userEntity) { private List<UserEntity> getFirstLeader(UserEntity userEntity) {
UserEntity leader = querySuperiorLeader(userEntity); // UserEntity leader = querySuperiorLeader(userEntity);
if (!StrUtil.equals("1", checkOrganizationHierarchy(leader))) { List<UserEntity> userEntityList = querySuperiorLeader(userEntity);
getFirstLeader(leader); 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<BiddingProje
//抽签项目中止 //抽签项目中止
iLotteryProjectService.lambdaUpdate() iLotteryProjectService.lambdaUpdate()
.set(LotteryProject::getStatus, LotteryProjectDto.StatusEnum.SUSPENSION.getCode()) .set(LotteryProject::getStatus, LotteryProjectDto.StatusEnum.SUSPENSION.getCode())
.set(LotteryProject::getStatusName,LotteryProjectDto.StatusEnum.SUSPENSION.getDescribe()) .set(LotteryProject::getStatusName, LotteryProjectDto.StatusEnum.SUSPENSION.getDescribe())
.set(LotteryProject::getStatusName,LotteryProjectDto.StatusEnum.SUSPENSION.getDescribe()) .set(LotteryProject::getStatusName, LotteryProjectDto.StatusEnum.SUSPENSION.getDescribe())
.eq(LotteryProject::getRelationId,id) .eq(LotteryProject::getRelationId, id)
.eq(LotteryProject::getType,LotteryProjectDto.TypeEnum.SYSTEM.getCode()) .eq(LotteryProject::getType, LotteryProjectDto.TypeEnum.SYSTEM.getCode())
.eq(LotteryProject::getDelFlag,"0") .eq(LotteryProject::getDelFlag, "0")
.update(); .update();
UserInfo userInfo = userProvider.get(); UserInfo userInfo = userProvider.get();
OrganizeEntity organize = organizeService.getInfoById(userInfo.getOrganizeId()); OrganizeEntity organize = organizeService.getInfoById(userInfo.getOrganizeId());
@ -1727,8 +1787,8 @@ public class BiddingProjectSubscribeServiceImpl extends ServiceImpl<BiddingProje
param.put("{{tenderingEntity}}", getOrganizationLastName(entity.getTenderingEntity())); param.put("{{tenderingEntity}}", getOrganizationLastName(entity.getTenderingEntity()));
param.put("{{projectName}}", entity.getProjectName()); param.put("{{projectName}}", entity.getProjectName());
Date bidOpeningTime = entity.getBidOpeningTime(); Date bidOpeningTime = entity.getBidOpeningTime();
if (null != bidOpeningTime){ if (null != bidOpeningTime) {
entity.setExplanationObid(DateUtil.dateFormatByPattern(bidOpeningTime,"yyyyMMdd")+entity.getExplanationObid()); entity.setExplanationObid(DateUtil.dateFormatByPattern(bidOpeningTime, "yyyyMMdd") + entity.getExplanationObid());
} }
param.put("{{explanationOfBid}}", entity.getExplanationObid()); param.put("{{explanationOfBid}}", entity.getExplanationObid());
String zb = ""; String zb = "";

Write Preview
Loading…
Cancel
Save