|
|
@@ -1109,6 +1109,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
|
|
|
}
|
|
|
}
|
|
|
Page<PurcInquiryItemInfo> orders = inquiryItemInfoDao.findAll(new Specification<PurcInquiryItemInfo>() {
|
|
|
+ @Override
|
|
|
public Predicate toPredicate(Root<PurcInquiryItemInfo> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
|
|
|
query.where(info.getPredicates(root, query, builder));
|
|
|
return null;
|
|
|
@@ -1118,8 +1119,8 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
|
|
|
if (null != filter && !StringUtils.isEmpty(enUU)) {
|
|
|
for (PurcInquiryItemInfo itemInfo : orders) {
|
|
|
PublicInquiryItem item = publicInquiryItemDao.findByVendUUAndSourceId(filter.getEnUU(), itemInfo.getId());
|
|
|
- InquiryEnRemind inquiryEnRemind = inquiryEnRemindDao.findByItemIdAndEnUU(itemInfo.getId(), filter.getEnUU());
|
|
|
- if (!StringUtils.isEmpty(inquiryEnRemind)) {
|
|
|
+ List<InquiryEnRemind> inquiryEnRemind = inquiryEnRemindDao.findByItemIdAndVendUU(itemInfo.getId(), filter.getEnUU());
|
|
|
+ if (!CollectionUtils.isEmpty(inquiryEnRemind) && inquiryEnRemind.size() > 0) {
|
|
|
itemInfo.setAllotStatus((short) 1);
|
|
|
} else {
|
|
|
itemInfo.setAllotStatus((short) 0);
|