diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/enums/StopReasonEnum.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/enums/StopReasonEnum.java index ce10e37d..094f31cb 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/enums/StopReasonEnum.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/enums/StopReasonEnum.java @@ -1,5 +1,9 @@ package com.xhpc.common.enums; +import java.util.Arrays; +import java.util.Map; +import java.util.stream.Collectors; + /** * @author yuyang * @date 2022/8/5 16:44 @@ -79,6 +83,15 @@ public enum StopReasonEnum { private final String code; private final String name; + + public String getCode(){ + return code; + } + + public String getName(){ + return name; + } + StopReasonEnum(String code, String name){ this.code = code; this.name = name; @@ -94,4 +107,9 @@ public enum StopReasonEnum { return ""; } + + public static Map getMap(){ + return Arrays.stream(StopReasonEnum.values()).collect(Collectors.toMap(StopReasonEnum::getCode, StopReasonEnum::getName)); + } + } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java index 487d2c99..442fa7db 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java @@ -12,6 +12,7 @@ import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.core.web.service.BaseService; import com.xhpc.common.data.redis.CacheRealtimeData; +import com.xhpc.common.enums.StopReasonEnum; import com.xhpc.common.redis.service.RedisService; import com.xhpc.common.security.service.TokenService; import com.xhpc.common.util.UserTypeUtil; @@ -363,6 +364,9 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis list = xhpcHistoryOrderMapper.getListPage(chargingStationId,chargingPileId,terminalId,phone, transactionNumber, 0, chargingStationName, operatorId, source, beginStartTime, beginEndTime, userId, type, number,affiliationOrganization,evcsOrderNo,plateNum,internetId,internetSerialNumber,terminalName,vinCode,overStartTime,overEndTime,personnelId,confirmResult,tenantId,1); } + Map reasonMap = StopReasonEnum.getMap(); + list.stream().forEach(map->map.put("stopReasonEvcsStr", reasonMap.get(map.get("stopReasonEvcs")))); + // 通过工具类创建writer,默认创建xls格式 BigExcelWriter writer = ExcelUtil.getBigWriter("HistoryOrder_" + System.currentTimeMillis() + ".xlsx"); writer.addHeaderAlias("historyOrderId", "历史订单ID"); @@ -406,7 +410,8 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis writer.addHeaderAlias("endTime", "结束充电时间"); writer.addHeaderAlias("updateTime", "结算时间"); writer.addHeaderAlias("chargingModeName", "订单来源"); - writer.addHeaderAlias("stopReasonEvcs", "停止原因"); + writer.addHeaderAlias("stopReasonEvcs", "停止原因代码"); + writer.addHeaderAlias("stopReasonEvcsStr", "停止原因说明"); writer.addHeaderAlias("sourceName", "用户类型"); // writer.addHeaderAlias("plateNum", "电站名称");