咸宁出行
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
xuhy
1 天以前 ff7bff64a0e1961a8a14f927eba43a5f06f78f92 
 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/FinancialStatementController.java


@@ -6,6 +6,7 @@


import com.stylefeng.guns.core.util.DateUtil;


import com.stylefeng.guns.core.util.ExcelExportUtil;


import com.stylefeng.guns.core.util.SinataUtil;


import com.stylefeng.guns.modular.system.service.ITOrderCrossCityService;


import com.stylefeng.guns.modular.system.service.ITOrderTaxiService;


import org.springframework.stereotype.Controller;


import org.springframework.web.bind.annotation.GetMapping;


@@ -15,6 +16,8 @@


import javax.annotation.Resource;


import javax.servlet.http.HttpServletRequest;


import javax.servlet.http.HttpServletResponse;


import java.text.ParseException;


import java.text.SimpleDateFormat;


import java.util.ArrayList;


import java.util.Date;


import java.util.List;


@@ -33,7 +36,9 @@


   


   @Resource


   private ITOrderTaxiService orderTaxiService;


	


   @Resource


   private ITOrderCrossCityService orderCrossCityService;




   


   /**


    * 跳转支付订单统计页


@@ -72,6 +77,21 @@


                                            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,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);


         }


      });


      return super.packForBT(page.setRecords(list));


   }