合并代码

puzhibing

2024-11-02 143a80b63131d63bb50296d17704b8966d34145a

合并代码

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java

@@ -162,9 +162,12 @@
                        break;
                }
            }
            tChargingOrderExport.setCreateTime(simpleDateFormat.format(chargingOrderListVO.getCreateTime()));
            tChargingOrderExport.setStartTime(simpleDateFormat.format(chargingOrderListVO.getStartTime()));
            tChargingOrderExport.setEndTime(simpleDateFormat.format(chargingOrderListVO.getEndTime()));
            String s1 = DateUtils.localDateTimeToString(chargingOrderListVO.getCreateTime());
            String s2 = DateUtils.localDateTimeToString(chargingOrderListVO.getStartTime());
            String s3 = DateUtils.localDateTimeToString(chargingOrderListVO.getEndTime());
            tChargingOrderExport.setCreateTime(s1);
            tChargingOrderExport.setStartTime(s2);
            tChargingOrderExport.setEndTime(s3);
            tChargingOrderExport.setRechargePaymentStatus(chargingOrderListVO.getRechargePaymentStatus()+"");
            tChargingOrderExport.setType("充电订单");
            tChargingOrderExport.setChargingType("单桩双充");