autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-06 19:10:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-03-15 14:56:40 +08:00
parent 00eab8f6b0
commit a701f53ae1
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -468,12 +468,17 @@ public class OrderService {
for (OrderVO orderVO : pageInfo.getList()) { for (OrderVO orderVO : pageInfo.getList()) {
orderVO.setPileConnectorCode(orderVO.getPileSn() + orderVO.getConnectorCode()); orderVO.setPileConnectorCode(orderVO.getPileSn() + orderVO.getConnectorCode());
if (orderVO.getStartTime() != null && orderVO.getEndTime() != null) { String chargingTime = "0分钟";
if (orderVO.getStartTime() != null) {
Date startTimeDate = DateUtils.parseDate(orderVO.getStartTime()); Date startTimeDate = DateUtils.parseDate(orderVO.getStartTime());
Date endTimeDate = DateUtils.parseDate(orderVO.getEndTime()); Date endTimeDate = new Date();
if (orderVO.getEndTime() != null) {
endTimeDate = DateUtils.parseDate(orderVO.getEndTime());
}
// 计算出两个时间差 // 计算出两个时间差
orderVO.setChargingTime(DateUtils.getDatePoor(endTimeDate, startTimeDate)); chargingTime = DateUtils.getDatePoor(endTimeDate, startTimeDate);
} }
orderVO.setChargingTime(chargingTime);
} }
// 返回结果集 // 返回结果集