管理后台二期

xuhy

6 天以前 b02d06c1421245e0e0cc82fc7a26a2508d81048f

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/FinancialStatementController.java

@@ -69,9 +69,9 @@
   @ResponseBody
   @RequestMapping("/paymentOrderStatisticsList")
   public Object paymentOrderStatisticsList(String paymentCode, String orderCode, String userPhone,
                                            String driverPhone, String createTime, String paymentTime){
                                            String driverPhone, String createTime, String paymentTime,Integer orderType){
      Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
      List<Map<String, Object>> list = orderTaxiService.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTime, paymentTime);
      List<Map<String, Object>> list = orderTaxiService.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTime, paymentTime,orderType);
      return super.packForBT(page.setRecords(list));
   }
   
@@ -88,9 +88,10 @@
   @ResponseBody
   @RequestMapping("/paymentOrderStatisticsList_export")
   public void paymentOrderStatisticsList_export(String paymentCode, String orderCode, String userPhone,
                                                 String driverPhone, String createTime, String paymentTime, HttpServletRequest request, HttpServletResponse response){
                                                 String driverPhone, String createTime, String paymentTime,Integer orderType,
                                      HttpServletRequest request, HttpServletResponse response){
      Page<Map<String, Object>> page = new Page(1, 9999);
      List<Map<String, Object>> list = orderTaxiService.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTime, paymentTime);
      List<Map<String, Object>> list = orderTaxiService.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTime, paymentTime,orderType);
      
      // 表格数据【封装】
      List<List<String>> dataList = new ArrayList<>();
@@ -99,6 +100,7 @@
      List<String> shellList = new ArrayList<String>();
      shellList.add("支付流水号");
      shellList.add("订单号");
      shellList.add("订单类型");
      shellList.add("支付用户手机号");
      shellList.add("支付金额");
      shellList.add("接单司机手机号");
@@ -121,6 +123,19 @@
         }else{
            shellList.add("-");
         }
         if(SinataUtil.isNotEmpty(object.get("orderType"))){
            int orderType1 = Integer.parseInt(object.get("orderType").toString());
            switch (orderType1){
               case 2:
                  shellList.add("出租车订单");
                  break;
               case 3:
                  shellList.add("跨城出行订单");
                  break;
            }
         }else{
            shellList.add("-");
         }
         if(SinataUtil.isNotEmpty(object.get("userPhone"))){
            shellList.add(object.get("userPhone").toString());
         }else{