diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
index 6f3cc24fd..e81b4a574 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -468,15 +468,12 @@ public class OrderService {
 
 		for (OrderVO orderVO : pageInfo.getList()) {
 			orderVO.setPileConnectorCode(orderVO.getPileSn() + orderVO.getConnectorCode());
-			Date endTimeDate;
-			Date startTimeDate = sdf.parse(orderVO.getStartTime());
-			if (StringUtils.isNotBlank(orderVO.getEndTime())) {
-				endTimeDate = sdf.parse(orderVO.getEndTime());
-			} else {
-				endTimeDate = new Date();
+			if (orderVO.getStartTime() != null && orderVO.getEndTime() != null) {
+				Date startTimeDate = DateUtils.parseDate(orderVO.getStartTime());
+				Date endTimeDate = DateUtils.parseDate(orderVO.getEndTime());
+				// 计算出两个时间差
+				orderVO.setChargingTime(DateUtils.getDatePoor(endTimeDate, startTimeDate));
 			}
-			// 计算出两个时间差
-			orderVO.setChargingTime(DateUtils.getDatePoor(endTimeDate, startTimeDate));
 		}
 
 		// 返回结果集
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
index e376d44b8..ab7f1be54 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
@@ -700,8 +700,8 @@
             t1.order_amount as orderAmount,
             t1.pay_amount as payAmount,
             t2.total_used_electricity as chargingDegree,
-            t2.create_time as startTime,
-            t2.update_time as endTime
+            t1.charge_start_time as startTime,
+            t1.charge_end_time as endTime
         from order_basic_info t1
             join order_detail t2 on t1.order_code = t2.order_code
             join pile_station_info t3 on t1.station_id = t3.id