diff --git a/business-service-dao/src/main/java/com/ho/business/service/impl/EarningsCalculateServiceImpl.java b/business-service-dao/src/main/java/com/ho/business/service/impl/EarningsCalculateServiceImpl.java index 7eb1663..991d4b1 100644 --- a/business-service-dao/src/main/java/com/ho/business/service/impl/EarningsCalculateServiceImpl.java +++ b/business-service-dao/src/main/java/com/ho/business/service/impl/EarningsCalculateServiceImpl.java @@ -209,35 +209,42 @@ public class EarningsCalculateServiceImpl implements EarningsCalculateService { ec.setMonth(time.substring(time.length() - 2, time.length())); String reportName = CommonConstant.REPORT_NAME; String billName = CommonConstant.BILL_NAME; + String name = station.getName(); if(CommonConstant.langTemp.EN_US.equals(earningsCalculateReq.getLang())){ reportName = CommonConstant.REPORT_NAME_EN; billName = CommonConstant.BILL_NAME_EN; + name = station.getNameEn(); } if(CommonConstant.langTemp.FR_FR.equals(earningsCalculateReq.getLang())){ reportName = CommonConstant.REPORT_NAME_FRA; billName = CommonConstant.BILL_NAME_FRA; + name = station.getNameFra(); } if(CommonConstant.langTemp.ES_ES.equals(earningsCalculateReq.getLang())){ reportName = CommonConstant.REPORT_NAME_SPA; billName = CommonConstant.BILL_NAME_SPA; + name = station.getNameSpa(); } if(CommonConstant.langTemp.AR_EG.equals(earningsCalculateReq.getLang())){ reportName = CommonConstant.REPORT_NAME_ARA; billName = CommonConstant.BILL_NAME_ARA; + name = station.getNameDe(); } if(CommonConstant.langTemp.DE_DE.equals(earningsCalculateReq.getLang())){ reportName = CommonConstant.REPORT_NAME_DE; billName = CommonConstant.BILL_NAME_DE; + name = station.getNamePl(); } if(CommonConstant.langTemp.PL_PL.equals(earningsCalculateReq.getLang())){ reportName = CommonConstant.REPORT_NAME_PL; billName = CommonConstant.BILL_NAME_PL; + name = station.getNameAra(); } // 电站名称(报表标题) if (type == 0) { - ec.setStationName("( " + time + " ) "+reportName); + ec.setStationName(name + "( " + time + " ) "+reportName); } else { - ec.setStationName("( " + time + " ) "+billName); + ec.setStationName(name + "( " + time + " ) "+billName); } ec.setList(list); //充电收益 diff --git a/business-service-dao/src/main/resources/mapper/StationMapper.xml b/business-service-dao/src/main/resources/mapper/StationMapper.xml index 5e09ad1..74bb210 100644 --- a/business-service-dao/src/main/resources/mapper/StationMapper.xml +++ b/business-service-dao/src/main/resources/mapper/StationMapper.xml @@ -4,7 +4,16 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + + id + ,pid,group_id,dept_id,address,longitude,latitude,capacity,rate_power, + name,name_en,name_fra,name_spa,name_de,name_pl,name_ara, + nation,nation_en,nation_fra,nation_spa,nation_de,nation_pl,nation_ara, + province,province_en,province_fra,province_spa,province_de,province_pl,province_ara, + status,type,create_time,contact,contact_details,grid_time, + update_time,deleted,is_enable,cabin_num,district,ad_code,is_daily_count,topology_type,cupboard_type,plan_version,inverter_flag,pv_power,icc_id,province,city, + electricity_type,customer_type,voltage_level,batch_number + id ,pid,group_id,dept_id,address,longitude,latitude,capacity,rate_power, @@ -91,7 +100,7 @@