后台机器类

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java

@@ -1,6 +1,9 @@
 package com.iamberry.rst.controllers.pts;
 
+import com.github.pagehelper.Page;
 import com.iamberry.rst.core.order.Order;
+import com.iamberry.rst.core.order.RentType;
+import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.pts.*;
 import com.iamberry.rst.core.tools.QRCJson;
 import com.iamberry.rst.core.tools.WeixinUtil;
@@ -10,6 +13,7 @@ import com.iamberry.wechat.tools.ResponseJson;
 import com.iamberry.wechat.tools.ResultInfo;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
+import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -21,7 +25,9 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by LJK on 2017/8/29.
@@ -49,24 +55,72 @@ public class AdminMachineController {
      * @param request
      * @return
      */
-    @RequiresPermissions("produce:list_produce:produce")
+    /**
+     * 根据条件查询订单集合
+     * @author muzx
+     * @date 2017年5月17日
+     * @param pageSize
+     * @param pageNO
+     * @param order
+     * @return
+     */
+    @RequiresPermissions("order:select_all:order")
     @RequestMapping("/_machine_list")
-    public ModelAndView selectOrderList(HttpServletRequest request,
-                                        @RequestParam(value = "pageNO", defaultValue = "1", required = false) int pageNO,
-                                        @RequestParam(value = "pageTotal", required = false) Integer pageTotal,
-                                        @RequestParam(value = "pageSize", defaultValue = "5", required = false) int pageSize,
-                                        Order order) {
-        ModelAndView mv = new ModelAndView("produce/produce_list");
-        StringBuilder url = new StringBuilder("/admin/produce/_produce_list?pageSize=" + pageSize);
-        List<Produce> list = produceService.getProduceList();
-        mv.addObject("result", list);
-        return mv;
-    }
-    @ResponseBody
-    @RequestMapping("/uploadProcessOptions")
-    public ResponseJson uploadProcessOptions(HttpServletRequest request,@RequestBody JSONObject query){
-        ResponseJson rj = new ResponseJson();
+    public ModelAndView listOrder(
+            @RequestParam(value= "pageSize",defaultValue= "6" ,required=false) Integer pageSize,
+            @RequestParam(value = "pageNO", defaultValue = "1",required=false) Integer pageNO,
+            @RequestParam(value = "totalNum", defaultValue = "0",required=false) Integer totalNum,
+            Order order){
+        ModelAndView mv = new ModelAndView("machine/machine_list");
+        PagedResult<Order> pagedResult = machineService.listOrder(pageNO, pageSize, order, totalNum == 0);
 
-        return rj;
+        if(totalNum != 0) {
+            pagedResult.setTotal(totalNum);
+            pagedResult.setPages((int) Math.ceil((double)totalNum/pageSize));
+        }
+        StringBuilder sb = new StringBuilder("/admin/order/select_list?pageSize=" + pageSize);
+
+        if (StringUtils.isNotEmpty(order.getOrderAddressName())) {
+            sb.append("&orderAddressName=");
+            sb.append(order.getOrderAddressName());
+            mv.addObject("orderAddressName",order.getOrderAddressName());
+        }
+        if (StringUtils.isNotEmpty(order.getOrderAddressTel())) {
+            sb.append("&orderAddressTel=" );
+            sb.append(order.getOrderAddressTel());
+            mv.addObject("orderAddressTel",order.getOrderAddressTel());
+        }
+        if (StringUtils.isNotEmpty(order.getOrderOpenId())) {
+            sb.append("&orderOpenId=");
+            sb.append(order.getOrderOpenId());
+            mv.addObject("orderOpenId",order.getOrderOpenId());
+        }
+        if (order.getOrderRentType() != null && order.getOrderRentType() != -1) {
+            sb.append("&orderRentType=" );
+            sb.append(order.getOrderRentType());
+            mv.addObject("orderRentType",order.getOrderRentType());
+        }
+        if (order.getOrderPayType() != null && order.getOrderPayType() != -1) {
+            sb.append("&orderPayType=" );
+            sb.append(order.getOrderPayType());
+            mv.addObject("orderPayType",order.getOrderPayType());
+        }
+        if (order.getOrderStatus() != null && order.getOrderStatus() != -1) {
+            sb.append("&orderStatus=" );
+            sb.append(order.getOrderStatus());
+            mv.addObject("orderStatus",order.getOrderStatus());
+        }
+        sb.append("&totalNum=");
+        sb.append(totalNum == 0 ? pagedResult.getTotal() : totalNum);
+        sb.append("&pageNO=");
+
+        //查询所有正在使用的租赁类型
+        List<RentType> rentTypeList = orderService.listRentType();
+        mv.addObject("rentTypeList",rentTypeList);
+
+        mv.addObject("page", pagedResult);
+        mv.addObject("url", sb.toString());
+        mv.addObject("conditionOrder",order);
+        return mv;
     }
 }