采购订单 增加提单号和多个日期的查询回显字段

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

@@ -91,16 +91,23 @@ public class PurchaseOrderController extends BladeController {
 					 			 @RequestParam(value = "billNo",required = false) String billNo,//提单号
 								 @RequestParam(value = "strCorpName",required = false) String strCorpName,//供应商名称
 								 @RequestParam(value = "strPurchaserName",required = false) String strPurchaserName,//采购商名称
-								 @RequestParam(value = "businesStartDate",required = false) String businesStartDate,//订单开始时间
+
+								 @RequestParam(value = "businesStartDate",required = false) String businesStartDate,//订单开始时间  busines_date
 								 @RequestParam(value = "businesEndDate",required = false) String businesEndDate,//订单结束时间
-								 @RequestParam(value = "accountsCollectionStartDate",required = false) String accountsCollectionStartDate,//付款开始时间
-								 @RequestParam(value = "accountsCollectionEndDate",required = false) String accountsCollectionEndDate,//付款结束时间
-								 @RequestParam(value = "dateOfStartArrival",required = false) String dateOfStartArrival,//付款开始时间
-								 @RequestParam(value = "dateOfEndArrival",required = false) String dateOfEndArrival,//付款开始时间,
-								 @RequestParam(value = "requiredDeliveryStartDate",required = false) String requiredDeliveryStartDate,//付款开始时间
-								 @RequestParam(value = "requiredDeliveryEndDate",required = false) String requiredDeliveryEndDate,//付款开始时间
-								 @RequestParam(value = "requiredArrivalStartDate",required = false) String requiredArrivalStartDate,//付款开始时间
-								 @RequestParam(value = "requiredArrivalEndDate",required = false) String requiredArrivalEndDate,//付款开始时间
+								 @RequestParam(value = "accountsCollectionStartDate",required = false) String accountsCollectionStartDate,//应收(付)款开始时间  accounts_collection_date
+								 @RequestParam(value = "accountsCollectionEndDate",required = false) String accountsCollectionEndDate,//应收(付)款结束时间
+
+								 @RequestParam(value = "dateOfStartArrival",required = false) String dateOfStartArrival,//实际到港开始日期 date_of_arrival
+								 @RequestParam(value = "dateOfEndArrival",required = false) String dateOfEndArrival,//实际到港结束时间,
+
+								 @RequestParam(value = "requiredDeliveryStartDate",required = false) String requiredDeliveryStartDate,//要求发货开始日期  required_delivery_date
+								 @RequestParam(value = "requiredDeliveryEndDate",required = false) String requiredDeliveryEndDate,//要求发货结束时间
+
+								 @RequestParam(value = "requiredArrivalStartDate",required = false) String requiredArrivalStartDate,//要求到货开始日期  required_arrival_date
+								 @RequestParam(value = "requiredArrivalEndDate",required = false) String requiredArrivalEndDate,//要求到货结束日期
+
+					             @RequestParam(value = "creditStartDate",required = false) String creditStartDate,//信用证到期日-开始日期  credit_date
+					             @RequestParam(value = "creditEndDate",required = false) String creditEndDate,//信用证到期日-结束时间
 								 Order order
 								)
 	{
@@ -144,9 +151,10 @@ public class PurchaseOrderController extends BladeController {
 		queryWrapper.apply(StringUtils.isNotBlank(billNo),"find_in_set('"+billNo+"',bill_no)");
 		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),"arrival_date",dateOfStartArrival,dateOfEndArrival);
+		queryWrapper.between(StringUtils.isNotBlank(dateOfStartArrival)&&StringUtils.isNotBlank(dateOfEndArrival),"date_of_arrival",dateOfStartArrival,dateOfEndArrival);
 		queryWrapper.between(StringUtils.isNotBlank(requiredDeliveryStartDate)&&StringUtils.isNotBlank(requiredDeliveryEndDate),"required_delivery_date",requiredDeliveryStartDate,requiredDeliveryEndDate);
 		queryWrapper.between(StringUtils.isNotBlank(requiredArrivalStartDate)&&StringUtils.isNotBlank(requiredArrivalEndDate),"required_arrival_date",requiredArrivalStartDate,requiredArrivalEndDate);
+		queryWrapper.between(StringUtils.isNotBlank(creditStartDate)&&StringUtils.isNotBlank(creditEndDate),"credit_date",creditStartDate,creditEndDate);
 		Page<Order> page=new Page<>(current,size);
 		IPage<Order> pages = orderService.page(page,queryWrapper);
 		List<Order> records = pages.getRecords();