|
|
@@ -17,6 +17,7 @@ import org.springframework.data.domain.Page;
|
|
|
import org.springframework.data.jpa.domain.Specification;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
+import org.springframework.ui.ModelMap;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
import org.springframework.util.StringUtils;
|
|
|
|
|
|
@@ -27,7 +28,6 @@ import com.uas.platform.b2b.dao.PurchaseOrderAllItemDao;
|
|
|
import com.uas.platform.b2b.dao.PurchaseOrderDao;
|
|
|
import com.uas.platform.b2b.dao.PurchaseOrderDoneDao;
|
|
|
import com.uas.platform.b2b.dao.PurchaseOrderEndDao;
|
|
|
-import com.uas.platform.b2b.dao.PurchaseOrderIndexDao;
|
|
|
import com.uas.platform.b2b.dao.PurchaseOrderItemDao;
|
|
|
import com.uas.platform.b2b.dao.PurchaseOrderReplyDao;
|
|
|
import com.uas.platform.b2b.dao.PurchaseOrderTodoDao;
|
|
|
@@ -61,6 +61,7 @@ import com.uas.platform.core.model.PageInfo;
|
|
|
import com.uas.platform.core.model.Status;
|
|
|
import com.uas.platform.core.persistence.criteria.PredicateUtils;
|
|
|
import com.uas.platform.core.util.serializer.FlexJsonUtils;
|
|
|
+import com.uas.search.b2b.model.PageParams;
|
|
|
|
|
|
@Service
|
|
|
public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
@@ -95,9 +96,6 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
@Autowired
|
|
|
private EnterpriseDao enterpriseDao;
|
|
|
|
|
|
- @Autowired
|
|
|
- private PurchaseOrderIndexDao purchaseOrderIndexDao;
|
|
|
-
|
|
|
@Autowired
|
|
|
private UserBaseInfoDao userBaseInfoDao;
|
|
|
|
|
|
@@ -130,9 +128,12 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
if (filter != null) {
|
|
|
if (StringUtils.hasText(filter.getKeyword())) {
|
|
|
List<Object> lists = new ArrayList<>();
|
|
|
- List<PurchaseOrderAll> listss = searchService.searchPurchaseOrderIds(filter.getKeyword(), null)
|
|
|
- .getContent();
|
|
|
- for (PurchaseOrderAll list : listss) {
|
|
|
+ PageParams pageParams = new PageParams();
|
|
|
+ ModelMap map = new ModelMap();
|
|
|
+ map.put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
|
|
|
+ pageParams.setFilters(map);
|
|
|
+ for (PurchaseOrderAll list : searchService.searchPurchaseOrderIds(filter.getKeyword(), pageParams)
|
|
|
+ .getContent()) {
|
|
|
lists.add(list.getId());
|
|
|
}
|
|
|
pageInfo.expression(PredicateUtils.in("id", lists, false));
|
|
|
@@ -396,9 +397,12 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
if (filter != null) {
|
|
|
if (StringUtils.hasText(filter.getKeyword())) {
|
|
|
List<Object> lists = new ArrayList<>();
|
|
|
- List<PurchaseOrderTodo> listss = searchService.searchPurchaseTodoOrderIds(filter.getKeyword(), null)
|
|
|
- .getContent();
|
|
|
- for (PurchaseOrderTodo list : listss) {
|
|
|
+ PageParams pageParams = new PageParams();
|
|
|
+ ModelMap map = new ModelMap();
|
|
|
+ map.put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
|
|
|
+ pageParams.setFilters(map);
|
|
|
+ for (PurchaseOrderTodo list : searchService.searchPurchaseTodoOrderIds(filter.getKeyword(), pageParams)
|
|
|
+ .getContent()) {
|
|
|
lists.add(list.getId());
|
|
|
}
|
|
|
pageInfo.expression(PredicateUtils.in("id", lists, false));
|
|
|
@@ -448,9 +452,12 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
if (filter != null) {
|
|
|
if (StringUtils.hasText(filter.getKeyword())) {
|
|
|
List<Object> lists = new ArrayList<>();
|
|
|
- List<PurchaseOrderDone> listss = searchService.searchPurchaseDoneOrderIds(filter.getKeyword(), null)
|
|
|
- .getContent();
|
|
|
- for (PurchaseOrderDone list : listss) {
|
|
|
+ PageParams pageParams = new PageParams();
|
|
|
+ ModelMap map = new ModelMap();
|
|
|
+ map.put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
|
|
|
+ pageParams.setFilters(map);
|
|
|
+ for (PurchaseOrderAll list : searchService.searchPurchaseOrderIds(filter.getKeyword(), pageParams)
|
|
|
+ .getContent()) {
|
|
|
lists.add(list.getId());
|
|
|
}
|
|
|
pageInfo.expression(PredicateUtils.in("id", lists, false));
|
|
|
@@ -498,9 +505,12 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
if (filter != null) {
|
|
|
if (StringUtils.hasText(filter.getKeyword())) {
|
|
|
List<Object> lists = new ArrayList<>();
|
|
|
- List<PurchaseOrderEnd> listss = searchService.searchaPurchaseEndOrderIds(filter.getKeyword(), null)
|
|
|
- .getContent();
|
|
|
- for (PurchaseOrderEnd list : listss) {
|
|
|
+ PageParams pageParams = new PageParams();
|
|
|
+ ModelMap map = new ModelMap();
|
|
|
+ map.put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
|
|
|
+ pageParams.setFilters(map);
|
|
|
+ for (PurchaseOrderEnd list : searchService.searchaPurchaseEndOrderIds(filter.getKeyword(), pageParams)
|
|
|
+ .getContent()) {
|
|
|
lists.add(list.getId());
|
|
|
}
|
|
|
pageInfo.expression(PredicateUtils.in("id", lists, false));
|
|
|
@@ -547,9 +557,12 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
if (filter != null) {
|
|
|
if (StringUtils.hasText(filter.getKeyword())) {
|
|
|
List<Object> lists = new ArrayList<>();
|
|
|
- List<PurchaseOrderWaiting> listss = searchService
|
|
|
- .searchPurchaseWaitingOrderIds(filter.getKeyword(), null).getContent();
|
|
|
- for (PurchaseOrderWaiting list : listss) {
|
|
|
+ PageParams pageParams = new PageParams();
|
|
|
+ ModelMap map = new ModelMap();
|
|
|
+ map.put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
|
|
|
+ pageParams.setFilters(map);
|
|
|
+ for (PurchaseOrderWaiting list : searchService
|
|
|
+ .searchPurchaseWaitingOrderIds(filter.getKeyword(), pageParams).getContent()) {
|
|
|
lists.add(list.getId());
|
|
|
}
|
|
|
pageInfo.expression(PredicateUtils.in("id", lists, false));
|
|
|
@@ -633,4 +646,298 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
return purchaseOrderDao.getPurcCounByEnUU(uu);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public Page<PurchaseOrder> findAllOrdersByPageInfo(final PageInfo pageInfo, final SearchFilter filter) {
|
|
|
+ if (filter != null) {
|
|
|
+ if (!CollectionUtils.isEmpty(filter.getDistribute()))
|
|
|
+ pageInfo.expression(PredicateUtils.in("enUU", filter.getDistribute(), false));
|
|
|
+ }
|
|
|
+ return purchaseOrderDao.findAll(new Specification<PurchaseOrder>() {
|
|
|
+ @Override
|
|
|
+ public Predicate toPredicate(Root<PurchaseOrder> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
|
|
|
+ query.where(pageInfo.getPredicates(root, query, builder));
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ }, pageInfo);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Page<PurchaseOrderAll> findAllOrdersDetailByPageInfo(final PageInfo pageInfo, final SearchFilter filter) {
|
|
|
+ if (filter != null) {
|
|
|
+ if (StringUtils.hasText(filter.getKeyword())) {
|
|
|
+ List<Object> lists = new ArrayList<>();
|
|
|
+ PageParams pageParams = new PageParams();
|
|
|
+ ModelMap map = new ModelMap();
|
|
|
+ map.put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
|
|
|
+ pageParams.setFilters(map);
|
|
|
+ for (PurchaseOrderAll list : searchService.searchPurchaseOrderIds(filter.getKeyword(), pageParams)
|
|
|
+ .getContent()) {
|
|
|
+ lists.add(list.getId());
|
|
|
+ }
|
|
|
+ pageInfo.expression(PredicateUtils.in("id", lists, false));
|
|
|
+ }
|
|
|
+ if (filter.getFromDate() != null)
|
|
|
+ pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
|
|
|
+ if (filter.getEndDate() != null)
|
|
|
+ pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
|
|
|
+ if (!CollectionUtils.isEmpty(filter.getDistribute()))
|
|
|
+ pageInfo.expression(PredicateUtils.in("enUU", filter.getDistribute(), false));
|
|
|
+ }
|
|
|
+ Page<PurchaseOrderAll> pageOrders = purchaseOrderAllDao.findAll(new Specification<PurchaseOrderAll>() {
|
|
|
+ @Override
|
|
|
+ public Predicate toPredicate(Root<PurchaseOrderAll> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
|
|
|
+ Predicate[] predicates = pageInfo.getPredicates(root, query, builder);
|
|
|
+ if (filter != null && filter.getFromDelivery() != null) {
|
|
|
+ predicates = Arrays.copyOf(predicates, predicates.length + 1);
|
|
|
+ SetJoin<PurchaseOrderAll, PurchaseOrderAllItem> join = root
|
|
|
+ .join(root.getModel().getSet("orderItems", PurchaseOrderAllItem.class), JoinType.INNER);
|
|
|
+ Predicate p = builder.greaterThanOrEqualTo(join.get("delivery").as(Date.class),
|
|
|
+ new Date(filter.getFromDelivery()));
|
|
|
+ predicates[predicates.length - 1] = p;
|
|
|
+ }
|
|
|
+ return query.where(predicates).getRestriction();
|
|
|
+ }
|
|
|
+ }, pageInfo);
|
|
|
+ List<PurchaseOrderAll> orders = pageOrders.getContent();
|
|
|
+ for (PurchaseOrderAll order : orders) {
|
|
|
+ Enterprise enter = enterpriseDao.findEnterpriseByUu(order.getVendUU());
|
|
|
+ if (enter != null) {
|
|
|
+ order.setEnName(enter.getEnName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // 明细包含关键词
|
|
|
+ if (filter != null) {
|
|
|
+ if (!CollectionUtils.isEmpty(orders)) {
|
|
|
+ for (PurchaseOrderAll order : orders) {
|
|
|
+ if (!CollectionUtils.isEmpty(order.getOrderItems())) {
|
|
|
+ for (PurchaseOrderAllItem orderItem : order.getOrderItems()) {
|
|
|
+ if (StringUtils.hasText(filter.getKeyword())) {
|
|
|
+ if (FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
|
|
|
+ orderItem.setKey(true);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return pageOrders;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Page<PurchaseOrderTodo> findTodoOrdersByPageInfo(final PageInfo pageInfo, final SearchFilter filter) {
|
|
|
+ if (filter != null) {
|
|
|
+ if (StringUtils.hasText(filter.getKeyword())) {
|
|
|
+ List<Object> lists = new ArrayList<>();
|
|
|
+ PageParams pageParams = new PageParams();
|
|
|
+ ModelMap map = new ModelMap();
|
|
|
+ map.put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
|
|
|
+ pageParams.setFilters(map);
|
|
|
+ for (PurchaseOrderTodo list : searchService.searchPurchaseTodoOrderIds(filter.getKeyword(), pageParams)
|
|
|
+ .getContent()) {
|
|
|
+ lists.add(list.getId());
|
|
|
+ }
|
|
|
+ pageInfo.expression(PredicateUtils.in("id", lists, false));
|
|
|
+ }
|
|
|
+
|
|
|
+ if (filter.getFromDate() != null)
|
|
|
+ pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
|
|
|
+ if (filter.getEndDate() != null)
|
|
|
+ pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
|
|
|
+ // if (!CollectionUtils.isEmpty(filter.getDistribute()))
|
|
|
+ // pageInfo.expression(PredicateUtils.in("enUU",
|
|
|
+ // filter.getDistribute(), false));
|
|
|
+ }
|
|
|
+ Page<PurchaseOrderTodo> pageOrders = purchaseOrderTodoDao.findAll(new Specification<PurchaseOrderTodo>() {
|
|
|
+ @Override
|
|
|
+ public Predicate toPredicate(Root<PurchaseOrderTodo> root, CriteriaQuery<?> query,
|
|
|
+ CriteriaBuilder builder) {
|
|
|
+ return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
|
|
|
+ }
|
|
|
+ }, pageInfo);
|
|
|
+ List<PurchaseOrderTodo> orders = pageOrders.getContent();
|
|
|
+ for (PurchaseOrderTodo order : orders) {
|
|
|
+ Enterprise enter = enterpriseDao.findEnterpriseByUu(order.getVendUU());
|
|
|
+ if (enter != null) {
|
|
|
+ order.setEnName(enter.getEnName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // 明细包含关键词
|
|
|
+ if (filter != null && StringUtils.hasText(filter.getKeyword())) {
|
|
|
+ if (!CollectionUtils.isEmpty(orders)) {
|
|
|
+ for (PurchaseOrderTodo order : orders) {
|
|
|
+ if (!CollectionUtils.isEmpty(order.getOrderItems())) {
|
|
|
+ for (PurchaseOrderTodoItem orderItem : order.getOrderItems()) {
|
|
|
+ if (FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
|
|
|
+ orderItem.setKey(true);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return pageOrders;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Page<PurchaseOrderDone> findDoneOrdersByPageInfo(final PageInfo pageInfo, final SearchFilter filter) {
|
|
|
+ if (filter != null) {
|
|
|
+ if (StringUtils.hasText(filter.getKeyword())) {
|
|
|
+ List<Object> lists = new ArrayList<>();
|
|
|
+ PageParams pageParams = new PageParams();
|
|
|
+ ModelMap map = new ModelMap();
|
|
|
+ map.put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
|
|
|
+ pageParams.setFilters(map);
|
|
|
+ for (PurchaseOrderDone list : searchService.searchPurchaseDoneOrderIds(filter.getKeyword(), pageParams)
|
|
|
+ .getContent()) {
|
|
|
+ lists.add(list.getId());
|
|
|
+ }
|
|
|
+ pageInfo.expression(PredicateUtils.in("id", lists, false));
|
|
|
+ }
|
|
|
+
|
|
|
+ if (filter.getFromDate() != null)
|
|
|
+ pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
|
|
|
+ if (filter.getEndDate() != null)
|
|
|
+ pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
|
|
|
+ // if (!CollectionUtils.isEmpty(filter.getDistribute()))
|
|
|
+ // pageInfo.expression(PredicateUtils.in("enUU",
|
|
|
+ // filter.getDistribute(), false));
|
|
|
+ }
|
|
|
+ Page<PurchaseOrderDone> pageOrders = purchaseOrderDoneDao.findAll(new Specification<PurchaseOrderDone>() {
|
|
|
+ @Override
|
|
|
+ public Predicate toPredicate(Root<PurchaseOrderDone> root, CriteriaQuery<?> query,
|
|
|
+ CriteriaBuilder builder) {
|
|
|
+ return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
|
|
|
+ }
|
|
|
+ }, pageInfo);
|
|
|
+ List<PurchaseOrderDone> orders = pageOrders.getContent();
|
|
|
+ for (PurchaseOrderDone order : orders) {
|
|
|
+ Enterprise enter = enterpriseDao.findEnterpriseByUu(order.getVendUU());
|
|
|
+ if (enter != null) {
|
|
|
+ order.setEnName(enter.getEnName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // 明细包含关键词
|
|
|
+ if (filter != null && StringUtils.hasText(filter.getKeyword())) {
|
|
|
+ if (!CollectionUtils.isEmpty(orders)) {
|
|
|
+ for (PurchaseOrderDone order : orders) {
|
|
|
+ if (!CollectionUtils.isEmpty(order.getOrderItems())) {
|
|
|
+ for (PurchaseOrderDoneItem orderItem : order.getOrderItems()) {
|
|
|
+ if (FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
|
|
|
+ orderItem.setKey(true);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return pageOrders;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Page<PurchaseOrderEnd> findEndOrdersByPageInfo(final PageInfo pageInfo, final SearchFilter filter) {
|
|
|
+ if (filter != null) {
|
|
|
+ if (StringUtils.hasText(filter.getKeyword())) {
|
|
|
+ List<Object> lists = new ArrayList<>();
|
|
|
+ PageParams pageParams = new PageParams();
|
|
|
+ ModelMap map = new ModelMap();
|
|
|
+ map.put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
|
|
|
+ pageParams.setFilters(map);
|
|
|
+ for (PurchaseOrderEnd list : searchService.searchaPurchaseEndOrderIds(filter.getKeyword(), pageParams)
|
|
|
+ .getContent()) {
|
|
|
+ lists.add(list.getId());
|
|
|
+ }
|
|
|
+ pageInfo.expression(PredicateUtils.in("id", lists, false));
|
|
|
+ }
|
|
|
+ if (filter.getFromDate() != null)
|
|
|
+ pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
|
|
|
+ if (filter.getEndDate() != null)
|
|
|
+ pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
|
|
|
+ if (!CollectionUtils.isEmpty(filter.getDistribute()))
|
|
|
+ pageInfo.expression(PredicateUtils.in("enUU", filter.getDistribute(), false));
|
|
|
+ }
|
|
|
+ Page<PurchaseOrderEnd> pageOrders = purchaseOrderEndDao.findAll(new Specification<PurchaseOrderEnd>() {
|
|
|
+ @Override
|
|
|
+ public Predicate toPredicate(Root<PurchaseOrderEnd> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
|
|
|
+ return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
|
|
|
+ }
|
|
|
+ }, pageInfo);
|
|
|
+ List<PurchaseOrderEnd> orders = pageOrders.getContent();
|
|
|
+ for (PurchaseOrderEnd order : orders) {
|
|
|
+ Enterprise enter = enterpriseDao.findEnterpriseByUu(order.getVendUU());
|
|
|
+ if (enter != null) {
|
|
|
+ order.setEnName(enter.getEnName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // 明细包含关键词
|
|
|
+ if (filter != null && StringUtils.hasText(filter.getKeyword())) {
|
|
|
+ if (!CollectionUtils.isEmpty(orders)) {
|
|
|
+ for (PurchaseOrderEnd order : orders) {
|
|
|
+ if (!CollectionUtils.isEmpty(order.getOrderItems())) {
|
|
|
+ for (PurchaseOrderEndItem orderItem : order.getOrderItems()) {
|
|
|
+ if (FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
|
|
|
+ orderItem.setKey(true);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return pageOrders;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Page<PurchaseOrderWaiting> findWaitingOrdersByPageInfo(final PageInfo pageInfo, final SearchFilter filter) {
|
|
|
+ if (filter != null) {
|
|
|
+ if (StringUtils.hasText(filter.getKeyword())) {
|
|
|
+ List<Object> lists = new ArrayList<>();
|
|
|
+ PageParams pageParams = new PageParams();
|
|
|
+ ModelMap map = new ModelMap();
|
|
|
+ map.put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
|
|
|
+ pageParams.setFilters(map);
|
|
|
+ for (PurchaseOrderWaiting list : searchService
|
|
|
+ .searchPurchaseWaitingOrderIds(filter.getKeyword(), pageParams).getContent()) {
|
|
|
+ lists.add(list.getId());
|
|
|
+ }
|
|
|
+ pageInfo.expression(PredicateUtils.in("id", lists, false));
|
|
|
+ }
|
|
|
+ if (filter.getFromDate() != null)
|
|
|
+ pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
|
|
|
+ if (filter.getEndDate() != null)
|
|
|
+ pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
|
|
|
+ if (!CollectionUtils.isEmpty(filter.getDistribute()))
|
|
|
+ pageInfo.expression(PredicateUtils.in("enUU", filter.getDistribute(), false));
|
|
|
+ }
|
|
|
+ Page<PurchaseOrderWaiting> pageOrders = purchaseOrderWaitingDao
|
|
|
+ .findAll(new Specification<PurchaseOrderWaiting>() {
|
|
|
+ @Override
|
|
|
+ public Predicate toPredicate(Root<PurchaseOrderWaiting> root, CriteriaQuery<?> query,
|
|
|
+ CriteriaBuilder builder) {
|
|
|
+ return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
|
|
|
+ }
|
|
|
+ }, pageInfo);
|
|
|
+ List<PurchaseOrderWaiting> orders = pageOrders.getContent();
|
|
|
+ for (PurchaseOrderWaiting order : orders) {
|
|
|
+ Enterprise enter = enterpriseDao.findEnterpriseByUu(order.getVendUU());
|
|
|
+ if (enter != null) {
|
|
|
+ order.setEnName(enter.getEnName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // 明细包含关键词
|
|
|
+ if (filter != null && StringUtils.hasText(filter.getKeyword())) {
|
|
|
+ if (!CollectionUtils.isEmpty(orders)) {
|
|
|
+ for (PurchaseOrderWaiting order : orders) {
|
|
|
+ if (!CollectionUtils.isEmpty(order.getOrderItems())) {
|
|
|
+ for (PurchaseOrderWaitingItem orderItem : order.getOrderItems()) {
|
|
|
+ if (FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
|
|
|
+ orderItem.setKey(true);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return pageOrders;
|
|
|
+ }
|
|
|
+
|
|
|
}
|
hejq