托书查询调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -120,7 +120,10 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 	@AutoLog(value = "托书主表实体类-分页列表查询")
 	@ApiOperation(value="托书主表实体类-分页列表查询", notes="托书主表实体类-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<SyShippingOrder>> queryPageList(SyShippingOrder syShippingOrder,String shippingOrderDateB,String shippingOrderDateE,String smailPo,String type,
+	public Result<IPage<SyShippingOrder>> queryPageList(SyShippingOrder syShippingOrder,
+														String shippingOrderDateB,String shippingOrderDateE,
+														String theFinalShippingDateB,String theFinalShippingDateE,
+														String smailPo,String type,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
@@ -133,6 +136,9 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 		if(oConvertUtils.isNotEmpty(shippingOrderDateB)){
 			queryWrapper.between("a.shipping_order_date",shippingOrderDateB,shippingOrderDateE);
 		}
+		if(oConvertUtils.isNotEmpty(theFinalShippingDateB)){
+			queryWrapper.between("a.the_Final_shipping_date",theFinalShippingDateB,theFinalShippingDateE);
+		}
 		if(oConvertUtils.isNotEmpty(syShippingOrder.getClientAbbreviation())){
 			queryWrapper.eq("b.client_abbreviation",syShippingOrder.getClientAbbreviation());
 		}
@@ -150,7 +156,10 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 		if(oConvertUtils.isNotEmpty(syShippingOrder.getStyleNum())){
 			queryWrapper.like("b.style_Number",syShippingOrder.getStyleNum());
 		}
-
+//		制单人
+		if(oConvertUtils.isNotEmpty(syShippingOrder.getStyleNum())){
+			queryWrapper.like("a.createBy",syShippingOrder.getCreateBy());
+		}
 
 		if(oConvertUtils.isNotEmpty(smailPo)){
 			QueryWrapper<SyShippingOrderItem> queryWrapper1 = new QueryWrapper<>();