无关风月
2025-03-04 07b1ae97f01ba7e75881a3600512aac9867dcc6c
补充管理后台文件上传
1个文件已修改
10 ■■■■ 已修改文件
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -551,14 +551,18 @@
        for (TChargingOrderAccountingStrategy tChargingOrderAccountingStrategy : list) {
            String format = "";
            String format1 = "";
            String temp1=list.get(0).getStartTime().split(":")[0];
            String[] split = tChargingOrderAccountingStrategy.getStartTime().split(":");
//            String temp1=list.get(0).getStartTime().split(":")[0];
            System.err.println("订单详情时间第一条"+list.get(0).getStartTime());
            System.err.println("订单详情时间开始"+tChargingOrderAccountingStrategy.getStartTime());
            System.err.println("订单详情时间结束"+tChargingOrderAccountingStrategy.getEndTime());
            String temp1=list.get(0).getStartTime().split(" ")[1].split(":")[0];
            String[] split = tChargingOrderAccountingStrategy.getStartTime().split(" ")[1].split(":");
            if (Integer.parseInt(split[0])>=Integer.valueOf(temp1)){
                format = byId.getCreateTime().format(formatter);
            }else {
                format = byId.getEndTime().format(formatter);
            }
            String[] split1 = tChargingOrderAccountingStrategy.getEndTime().split(":");
            String[] split1 = tChargingOrderAccountingStrategy.getEndTime().split(" ")[1].split(":");
            if (Integer.parseInt(split1[0])<Integer.valueOf(temp1)){
                format1 = byId.getCreateTime().format(formatter);
            }else {