管理后台二期

xuhy

1 天以前 37ba49430c8c6896020d8d1e8552022d786f31a0

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

@@ -112,6 +112,21 @@
                                      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,orderType);
      List<Map<String, Object>> list1 = orderCrossCityService.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTime, paymentTime,orderType);
      list.addAll(list1);
      list.sort((o1, o2) -> {
         String insertTime = o1.get("insertTime").toString();
         String insertTime1 = o2.get("insertTime").toString();
         Date o1Date = null;
         Date o2Date = null;
         try {
            o1Date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(insertTime);
            o2Date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(insertTime1);
            return o2Date.compareTo(o1Date);
         } catch (ParseException e) {
            throw new RuntimeException(e);
         }
      });
      
      // 表格数据【封装】
      List<List<String>> dataList = new ArrayList<>();