|
|
@@ -779,19 +779,21 @@ public class SaleServiceImpl implements SaleService{
|
|
|
|
|
|
QuotationRspDTO quotationRspDTO = new QuotationRspDTO();
|
|
|
PublicInquiryItem publicInquiryItem = inquiryEnRemind.getQuotation();
|
|
|
- quotationRspDTO.setAgreed(publicInquiryItem.getAgreed());
|
|
|
- quotationRspDTO.setRefusereason(publicInquiryItem.getRefusereason());
|
|
|
- //分段报价明细
|
|
|
- List<InquiryReplayDTO> inquiryReplayDTOList = new ArrayList<InquiryReplayDTO>();
|
|
|
- List<PublicInquiryReply> publicInquiryReplyList = publicInquiryItem.getReplies();
|
|
|
- if (!CollectionUtils.isEmpty(publicInquiryReplyList)) {
|
|
|
- for (PublicInquiryReply publicInquiryReply : publicInquiryReplyList) {
|
|
|
- InquiryReplayDTO inquiryReplayDTO = new InquiryReplayDTO(publicInquiryReply.getId(), publicInquiryReply.getLapQty(), publicInquiryReply.getPrice());
|
|
|
- inquiryReplayDTOList.add(inquiryReplayDTO);
|
|
|
+ if (!ObjectUtils.isEmpty(publicInquiryItem)) {
|
|
|
+ quotationRspDTO.setAgreed(publicInquiryItem.getAgreed());
|
|
|
+ quotationRspDTO.setRefusereason(publicInquiryItem.getRefusereason());
|
|
|
+ //分段报价明细
|
|
|
+ List<InquiryReplayDTO> inquiryReplayDTOList = new ArrayList<InquiryReplayDTO>();
|
|
|
+ List<PublicInquiryReply> publicInquiryReplyList = publicInquiryItem.getReplies();
|
|
|
+ if (!CollectionUtils.isEmpty(publicInquiryReplyList)) {
|
|
|
+ for (PublicInquiryReply publicInquiryReply : publicInquiryReplyList) {
|
|
|
+ InquiryReplayDTO inquiryReplayDTO = new InquiryReplayDTO(publicInquiryReply.getId(), publicInquiryReply.getLapQty(), publicInquiryReply.getPrice());
|
|
|
+ inquiryReplayDTOList.add(inquiryReplayDTO);
|
|
|
+ }
|
|
|
}
|
|
|
+ quotationRspDTO.setReplies(inquiryReplayDTOList);
|
|
|
+ remindRspDTO.setQutations(quotationRspDTO);
|
|
|
}
|
|
|
- quotationRspDTO.setReplies(inquiryReplayDTOList);
|
|
|
- remindRspDTO.setQutations(quotationRspDTO);
|
|
|
remindRspDTOList.add(remindRspDTO);
|
|
|
}
|
|
|
}else if("personal".equals(type)){
|
|
|
@@ -824,19 +826,21 @@ public class SaleServiceImpl implements SaleService{
|
|
|
//报价信息
|
|
|
QuotationRspDTO quotationRspDTO = new QuotationRspDTO();
|
|
|
PublicInquiryItem publicInquiryItem = inquiryRemind.getQuotation();
|
|
|
- quotationRspDTO.setAgreed(publicInquiryItem.getAgreed());
|
|
|
- quotationRspDTO.setRefusereason(publicInquiryItem.getRefusereason());
|
|
|
- //分段报价明细
|
|
|
- List<InquiryReplayDTO> inquiryReplayDTOList = new ArrayList<InquiryReplayDTO>();
|
|
|
- List<PublicInquiryReply> publicInquiryReplyList = publicInquiryItem.getReplies();
|
|
|
- if (!CollectionUtils.isEmpty(publicInquiryReplyList)) {
|
|
|
- for (PublicInquiryReply publicInquiryReply : publicInquiryReplyList) {
|
|
|
- InquiryReplayDTO inquiryReplayDTO = new InquiryReplayDTO(publicInquiryReply.getId(), publicInquiryReply.getLapQty(), publicInquiryReply.getPrice());
|
|
|
- inquiryReplayDTOList.add(inquiryReplayDTO);
|
|
|
+ if (!ObjectUtils.isEmpty(publicInquiryItem)) {
|
|
|
+ quotationRspDTO.setAgreed(publicInquiryItem.getAgreed());
|
|
|
+ quotationRspDTO.setRefusereason(publicInquiryItem.getRefusereason());
|
|
|
+ //分段报价明细
|
|
|
+ List<InquiryReplayDTO> inquiryReplayDTOList = new ArrayList<InquiryReplayDTO>();
|
|
|
+ List<PublicInquiryReply> publicInquiryReplyList = publicInquiryItem.getReplies();
|
|
|
+ if (!CollectionUtils.isEmpty(publicInquiryReplyList)) {
|
|
|
+ for (PublicInquiryReply publicInquiryReply : publicInquiryReplyList) {
|
|
|
+ InquiryReplayDTO inquiryReplayDTO = new InquiryReplayDTO(publicInquiryReply.getId(), publicInquiryReply.getLapQty(), publicInquiryReply.getPrice());
|
|
|
+ inquiryReplayDTOList.add(inquiryReplayDTO);
|
|
|
+ }
|
|
|
}
|
|
|
+ quotationRspDTO.setReplies(inquiryReplayDTOList);
|
|
|
+ remindRspDTO.setQutations(quotationRspDTO);
|
|
|
}
|
|
|
- quotationRspDTO.setReplies(inquiryReplayDTOList);
|
|
|
- remindRspDTO.setQutations(quotationRspDTO);
|
|
|
remindRspDTOList.add(remindRspDTO);
|
|
|
}
|
|
|
}
|