From 47e4f3023e51f2b0a942f19fc490e4ead732175f Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Fri, 26 Aug 2022 11:16:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8E=86=E5=8F=B2=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=87=BA=E7=9A=84=E5=81=9C=E6=AD=A2=E5=85=85?=
 =?UTF-8?q?=E7=94=B5=E5=8E=9F=E5=9B=A0=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xhpc/common/enums/StopReasonEnum.java  | 18 ++++++++++++++++++
 .../impl/XhpcHistoryOrderServiceImpl.java      |  7 ++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

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<String, String> 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<String, String> 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", "电站名称");