luodangjia
2024-10-28 bcff6cd41a09c5b3f5db68db8b9dbb2f90fb78f3
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
@@ -114,7 +114,7 @@
                tChargingOrderExport.setCity(data.get(0).getCity());
                tChargingOrderExport.setCityName(data.get(0).getDistricts());
                tChargingOrderExport.setSiteType(data.get(0).getSiteType());
                tChargingOrderExport.setStatus(data.get(0).getStatus()+"");
                Partner data2 = siteClient.getPartnerR(data.get(0).getPartnerId()).getData();
                if (data2!=null){
                    tChargingOrderExport.setPartner(data2.getName());
@@ -248,6 +248,10 @@
                    .between(TChargingOrder::getStartTime, byId.getStartTime(), byId.getEndTime())
                    .eq(TChargingOrder::getStatus, 5)
                    .eq(TChargingOrder::getRechargePaymentStatus, 2).list();
            int i = 1;
            for (TChargingOrder chargingOrder : list) {
            }
            byId.setList(list);
            String format = byId.getStartTime().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm:ss"));
            String format1 = byId.getEndTime().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm:ss"));