Skip to content

L
lingxi-lxy-yanshou
Commit 39b6c348 authored by liao_ds's avatar liao_ds
Browse files
Options

Merge remote-tracking branch 'origin/v2' into v2

parents 751b7775 1cdeb106
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 62 deletions
purchase-service/src/main/java/com/ssy/lingxi/purchase/serviceimpl/tender/ExpertExtractRecordServiceImpl.java
View file @ 39b6c348
...@@ -173,28 +173,36 @@ public class ExpertExtractRecordServiceImpl implements IExpertExtractRecordServi ...@@ -173,28 +173,36 @@ public class ExpertExtractRecordServiceImpl implements IExpertExtractRecordServi
} }
ExpertExtract expertExtract = expertExtractRecord.getExpertExtract(); ExpertExtract expertExtract = expertExtractRecord.getExpertExtract();
InviteTender inviteTender = expertExtract.getInviteTender(); InviteTender inviteTender = expertExtract.getInviteTender();
//评标内容 if(inviteTender != null){
List<SubmitTenderOutCheckRecord> submitTenderOutCheckRecordList = new ArrayList(); long evaluationStartTime = inviteTender.getEvaluationStartTime();
List<EvaluationTenderRequest> evaluationTenderRequestList = expertEvaluationTenderRequest.getEvaluationTenderList(); long evaluationEndTime = inviteTender.getEvaluationEndTime();
List<InviteTenderMember> memberList = inviteTender.getMemberList(); long now = System.currentTimeMillis();
List<EvaluationTenderOnline> evaluationTenderList = evaluationTenderRequestList.stream().map(evaluationTenderRequest -> { if(evaluationStartTime > now || evaluationEndTime < now){
Long memberId = evaluationTenderRequest.getInviteTenderMemberId(); throw new BusinessException(ResponseCode.PURCHASE_INVITE_TENDER_Evaluation_TIME);
InviteTenderMember inviteTenderMember = memberList.stream().filter(member -> member.getMemberId().longValue() == memberId.longValue()).findFirst().orElse(null); }
if (inviteTenderMember != null) {
inviteTenderMember.setSubmitTenderOutStatus(SubmitTenderOutStatusEnum.Not_Finish_Notice.getCode()); //评标内容
EvaluationTenderOnline evaluationTender = BeanUtil.copyProperties(evaluationTenderRequest, EvaluationTenderOnline.class); List<SubmitTenderOutCheckRecord> submitTenderOutCheckRecordList = new ArrayList();
evaluationTender.setInviteTenderMemberId(inviteTenderMember.getMemberId()); List<EvaluationTenderRequest> evaluationTenderRequestList = expertEvaluationTenderRequest.getEvaluationTenderList();
evaluationTender.setExpertExtractRecord(expertExtractRecord); List<InviteTenderMember> memberList = inviteTender.getMemberList();
List<EvaluationTenderOnline> evaluationTenderList = evaluationTenderRequestList.stream().map(evaluationTenderRequest -> {
//记录投标外部状态 Long memberId = evaluationTenderRequest.getInviteTenderMemberId();
SubmitTenderOutCheckRecord submitTenderOutCheckRecord = new SubmitTenderOutCheckRecord(); InviteTenderMember inviteTenderMember = memberList.stream().filter(member -> member.getMemberId().longValue() == memberId.longValue()).findFirst().orElse(null);
submitTenderOutCheckRecord.setMemberRoleId(sysUser.getMemberRoleId()); if (inviteTenderMember != null) {
submitTenderOutCheckRecord.setMemberRoleName(sysUser.getMemberRoleName()); inviteTenderMember.setSubmitTenderOutStatus(SubmitTenderOutStatusEnum.Not_Finish_Notice.getCode());
submitTenderOutCheckRecord.setCreateTime(System.currentTimeMillis()); EvaluationTenderOnline evaluationTender = BeanUtil.copyProperties(evaluationTenderRequest, EvaluationTenderOnline.class);
submitTenderOutCheckRecord.setSubmitTenderId(inviteTenderMember.getId()); evaluationTender.setInviteTenderMemberId(inviteTenderMember.getMemberId());
submitTenderOutCheckRecord.setOperationValue(InviteTenderInOperationEnum.getMessage(InviteTenderInOperationEnum.Finish_Selection_Tender.getCode())); evaluationTender.setExpertExtractRecord(expertExtractRecord);
submitTenderOutCheckRecord.setStatusValue("已评标");
submitTenderOutCheckRecordList.add(submitTenderOutCheckRecord); //记录投标外部状态
SubmitTenderOutCheckRecord submitTenderOutCheckRecord = new SubmitTenderOutCheckRecord();
submitTenderOutCheckRecord.setMemberRoleId(sysUser.getMemberRoleId());
submitTenderOutCheckRecord.setMemberRoleName(sysUser.getMemberRoleName());
submitTenderOutCheckRecord.setCreateTime(System.currentTimeMillis());
submitTenderOutCheckRecord.setSubmitTenderId(inviteTenderMember.getId());
submitTenderOutCheckRecord.setOperationValue(InviteTenderInOperationEnum.getMessage(InviteTenderInOperationEnum.Finish_Selection_Tender.getCode()));
submitTenderOutCheckRecord.setStatusValue("已评标");
submitTenderOutCheckRecordList.add(submitTenderOutCheckRecord);
// //记录内部状态 // //记录内部状态
// SubmitTenderInCheckRecord submitTenderInCheckRecord = new SubmitTenderInCheckRecord(); // SubmitTenderInCheckRecord submitTenderInCheckRecord = new SubmitTenderInCheckRecord();
...@@ -212,46 +220,49 @@ public class ExpertExtractRecordServiceImpl implements IExpertExtractRecordServi ...@@ -212,46 +220,49 @@ public class ExpertExtractRecordServiceImpl implements IExpertExtractRecordServi
// submitTenderInCheckRecord.setCreateTime(System.currentTimeMillis()); // submitTenderInCheckRecord.setCreateTime(System.currentTimeMillis());
// submitTenderInCheckRecordList.add(submitTenderInCheckRecord); // submitTenderInCheckRecordList.add(submitTenderInCheckRecord);
return evaluationTender; return evaluationTender;
}else{ }else{
return null; return null;
} }
}).filter(evaluationTender -> evaluationTender != null).collect(Collectors.toList()); }).filter(evaluationTender -> evaluationTender != null).collect(Collectors.toList());
expertExtractRecord.setEvaluationTenderList(evaluationTenderList); expertExtractRecord.setEvaluationTenderList(evaluationTenderList);
expertExtractRecord.setStatus(ExpertExtractStatusEnum.Evaluation.getCode()); expertExtractRecord.setStatus(ExpertExtractStatusEnum.Evaluation.getCode());
expertExtractRecordRepository.saveAndFlush(expertExtractRecord); expertExtractRecordRepository.saveAndFlush(expertExtractRecord);
//推荐会员 //推荐会员
List<EvaluationTenderRecommendRequest> evaluationTenderRecommendList = expertEvaluationTenderRequest.getEvaluationTenderRecommendList(); List<EvaluationTenderRecommendRequest> evaluationTenderRecommendList = expertEvaluationTenderRequest.getEvaluationTenderRecommendList();
List<EvaluationTenderRecommend> recommendList = evaluationTenderRecommendList.stream().map(evaluationTenderRecommendRequest -> { List<EvaluationTenderRecommend> recommendList = evaluationTenderRecommendList.stream().map(evaluationTenderRecommendRequest -> {
EvaluationTenderRecommend evaluationTenderRecommend = BeanUtil.copyProperties(evaluationTenderRecommendRequest, EvaluationTenderRecommend.class); EvaluationTenderRecommend evaluationTenderRecommend = BeanUtil.copyProperties(evaluationTenderRecommendRequest, EvaluationTenderRecommend.class);
evaluationTenderRecommend.setUserName(sysUser.getUserName()); evaluationTenderRecommend.setUserName(sysUser.getUserName());
evaluationTenderRecommend.setInviteTender(inviteTender); evaluationTenderRecommend.setInviteTender(inviteTender);
return evaluationTenderRecommend; return evaluationTenderRecommend;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
inviteTender.setEvaluationTenderRecommendList(recommendList); inviteTender.setEvaluationTenderRecommendList(recommendList);
inviteTenderRepository.saveAndFlush(inviteTender); inviteTenderRepository.saveAndFlush(inviteTender);
//招标内部状态 //招标内部状态
InviteTenderInCheckRecord inviteTenderInCheckRecord = new InviteTenderInCheckRecord(); InviteTenderInCheckRecord inviteTenderInCheckRecord = new InviteTenderInCheckRecord();
inviteTenderInCheckRecord.setStatusValue(InviteTenderInStatusEnum.getMessage(InviteTenderInStatusEnum.Submitted_Selection_Tender.getCode())); inviteTenderInCheckRecord.setStatusValue(InviteTenderInStatusEnum.getMessage(InviteTenderInStatusEnum.Submitted_Selection_Tender.getCode()));
inviteTenderInCheckRecord.setOperationValue(InviteTenderInOperationEnum.getMessage(InviteTenderInOperationEnum.Finish_Selection_Tender.getCode())); inviteTenderInCheckRecord.setOperationValue(InviteTenderInOperationEnum.getMessage(InviteTenderInOperationEnum.Finish_Selection_Tender.getCode()));
inviteTenderInCheckRecord.setUserId(sysUser.getUserId()); inviteTenderInCheckRecord.setUserId(sysUser.getUserId());
inviteTenderInCheckRecord.setUserName(sysUser.getUserName()); inviteTenderInCheckRecord.setUserName(sysUser.getUserName());
inviteTenderInCheckRecord.setUserJobTitle(sysUser.getUserJobTitle()); inviteTenderInCheckRecord.setUserJobTitle(sysUser.getUserJobTitle());
inviteTenderInCheckRecord.setUserOrgName(sysUser.getUserOrgName()); inviteTenderInCheckRecord.setUserOrgName(sysUser.getUserOrgName());
inviteTenderInCheckRecord.setMemberId(sysUser.getMemberId()); inviteTenderInCheckRecord.setMemberId(sysUser.getMemberId());
inviteTenderInCheckRecord.setMemberName(sysUser.getCompany()); inviteTenderInCheckRecord.setMemberName(sysUser.getCompany());
inviteTenderInCheckRecord.setMemberRoleId(sysUser.getMemberRoleId()); inviteTenderInCheckRecord.setMemberRoleId(sysUser.getMemberRoleId());
inviteTenderInCheckRecord.setMemberRoleName(sysUser.getMemberRoleName()); inviteTenderInCheckRecord.setMemberRoleName(sysUser.getMemberRoleName());
inviteTenderInCheckRecord.setCreateTime(System.currentTimeMillis()); inviteTenderInCheckRecord.setCreateTime(System.currentTimeMillis());
inviteTenderInCheckRecord.setInviteTenderId(inviteTender.getId()); inviteTenderInCheckRecord.setInviteTenderId(inviteTender.getId());
inviteTenderInCheckRecordRepository.saveAndFlush(inviteTenderInCheckRecord); inviteTenderInCheckRecordRepository.saveAndFlush(inviteTenderInCheckRecord);
//投标会员内部状态 //投标会员内部状态
submitTenderOutCheckRecordRepository.saveAll(submitTenderOutCheckRecordList); submitTenderOutCheckRecordRepository.saveAll(submitTenderOutCheckRecordList);
return "设置成功"; return "设置成功";
}else{
throw new BusinessException(ResponseCode.PURCHASE_INVITE_TENDER_NOT_EXIST);
}
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment