ruoyi-service/ruoyi-chargingPile/src/main/resources/template/充电桩申请记录.xlsxBinary files differ
ruoyi-service/ruoyi-chargingPile/src/main/resources/template/结算汇总.xlsxBinary files differ
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
@@ -114,7 +114,7 @@ tChargingOrderExport.setCity(data.get(0).getCity()); tChargingOrderExport.setCityName(data.get(0).getDistricts()); tChargingOrderExport.setSiteType(data.get(0).getSiteType()); tChargingOrderExport.setStatus(data.get(0).getStatus()+""); Partner data2 = siteClient.getPartnerR(data.get(0).getPartnerId()).getData(); if (data2!=null){ tChargingOrderExport.setPartner(data2.getName()); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/TChargingOrderExport.java
@@ -18,6 +18,7 @@ private String siteCode; @Excel(name = "电站名称",width = 30) private String siteName; @Excel(name = "终端名称",width = 30) private String terminalName; @Excel(name = "所属城市",width = 30) @@ -30,6 +31,8 @@ private Integer siteType; @Excel(name = "售电模式",width = 30,replace = {"正常使用_1","维修中_2","关闭下线_3"}) private String saleType; @Excel(name = "站点状态",width = 30,replace = {"正常使用_1","维修中_2","关闭下线_3"}) private String status; @Excel(name = "运营类型",width = 30,replace = {"直营_1","非直营_2"}) private String businessCategory; @Excel(name = "计费模板",width = 30)
