|
|
|
@ -854,7 +854,6 @@ public class BusinessOrderController {
|
|
|
|
|
businessOrderQueryWrapper.isNull("a.f_delete_mark");
|
|
|
|
|
businessOrderQueryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
|
|
|
|
|
businessOrderQueryWrapper.like("a.organize_json_id",organize);
|
|
|
|
|
// businessOrderQueryWrapper.eq("a.yunguan_mark","Y");
|
|
|
|
|
List<BusinessOrderEntity> businessOrderEntityList = businessOrderService.saleOrderByDeliveryOrderInfo(businessOrderQueryWrapper);
|
|
|
|
|
// List<Map<String, Object>> realList=new ArrayList<>();
|
|
|
|
|
for (BusinessOrderEntity entity: businessOrderEntityList) {
|
|
|
|
@ -960,7 +959,6 @@ public class BusinessOrderController {
|
|
|
|
|
businessOrderQueryWrapper.isNull("a.f_delete_mark");
|
|
|
|
|
businessOrderQueryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
|
|
|
|
|
businessOrderQueryWrapper.like("a.organize_json_id",organize);
|
|
|
|
|
// businessOrderQueryWrapper.eq("a.yunguan_mark","Y");
|
|
|
|
|
List<BusinessOrderEntity> businessOrderEntityList = businessOrderService.purchaseOrderByReceiptOrderInfo(businessOrderQueryWrapper);
|
|
|
|
|
// List<Map<String, Object>> realList=new ArrayList<>();
|
|
|
|
|
for (BusinessOrderEntity entity: businessOrderEntityList) {
|
|
|
|
|