Prechádzať zdrojové kódy

订单列表新增查询条件:下单员

xian 5 rokov pred
rodič
commit
e480998036

+ 6 - 0
watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -22,6 +22,7 @@ import com.iamberry.rst.faces.dm.SupplierProductService;
 import com.iamberry.rst.faces.order.*;
 import com.iamberry.rst.faces.product.ProductService;
 import com.iamberry.rst.faces.sms.SmsService;
+import com.iamberry.rst.faces.sys.SysService;
 import com.iamberry.rst.util.GenerateKeyUtil;
 import com.iamberry.rst.util.PageUtil;
 import com.iamberry.rst.utils.AdminUtils;
@@ -91,6 +92,8 @@ public class AdminSalesOrderController {
     private SupplierProductService supplierProductService;
     @Autowired
     private OrderDepartService orderDepartService;
+    @Autowired
+    private SysService sysService;
     /**
      * 分页查询订单列表信息
      * @param request
@@ -148,6 +151,9 @@ public class AdminSalesOrderController {
                 .setModelAndView(salesOrder, mv, "/admin/salesOrder/list_order_page", pagedResult);
         salesOrder.setSalesOrderItemList(null);
         // 查询订单各个状态数量
+        Admin admin = new Admin();
+        admin.setAdminStatus(1);
+        mv.addObject("admins", sysService.listSelectAdmin(admin));
         mv.addObject("orderNum",salesOrderService.getStatusNum());
         mv.addObject("listStoreInfo",listStoreInfo);
         mv.addObject("logisticsInfoList",logisticsInfoList);

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 11 - 3
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl