修改bug提交

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/PurchaseOrderController.java

@@ -95,6 +95,7 @@ public class PurchaseOrderController extends BladeController {
 								 @RequestParam(name = "size", defaultValue = "10") Integer size,
 					 			 @RequestParam(value = "billNo",required = false) String billNo,//提单号
 					 			 @RequestParam(value = "orderNo",required = false) String orderNo,//合同号
+					 			 @RequestParam(value = "tradeType",required = false) String tradeType,//贸易类型
 								 @RequestParam(value = "strCorpName",required = false) String strCorpName,//供应商名称
 								 @RequestParam(value = "strPurchaserName",required = false) String strPurchaserName,//采购商名称
 								 @RequestParam(value = "salesName",required = false) String salesName,//业务员
@@ -119,7 +120,9 @@ public class PurchaseOrderController extends BladeController {
 								)
 	{
 
-		QueryWrapper<Order> queryWrapper = Condition.getQueryWrapper(order);
+		QueryWrapper<Order> queryWrapper =new QueryWrapper<>();
+		queryWrapper.eq("trade_type",tradeType);
+
         //供应商
 		if(StringUtils.isNotBlank(strCorpName))
 		{
@@ -157,7 +160,7 @@ public class PurchaseOrderController extends BladeController {
 		queryWrapper.eq("tenant_id",AuthUtil.getTenantId());
 		queryWrapper.eq("bill_type",OrderTypeEnum.PURCHASE.getType());
 		queryWrapper.eq("trade_type",order.getTradeType());
-		queryWrapper.apply(StringUtils.isNotBlank(billNo),"find_in_set('"+billNo+"',bill_no)");
+		queryWrapper.like(StringUtils.isNotBlank(billNo),"bill_no",billNo);
 		queryWrapper.between(StringUtils.isNotBlank(businesStartDate)&&StringUtils.isNotBlank(businesEndDate),"busines_date",businesStartDate,businesEndDate);
 		queryWrapper.between(StringUtils.isNotBlank(accountsCollectionStartDate)&&StringUtils.isNotBlank(accountsCollectionEndDate),"accounts_collection_date",accountsCollectionStartDate,accountsCollectionEndDate);
 		queryWrapper.between(StringUtils.isNotBlank(dateOfStartArrival)&&StringUtils.isNotBlank(dateOfEndArrival),"date_of_arrival",dateOfStartArrival,dateOfEndArrival);