Pu Zhibing
5 天以前 c05a14bba4b86d83918d7cdc01635785bf5694c2
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
@@ -11,6 +11,7 @@
import com.ruoyi.chargingPile.api.model.Partner;
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.chargingPile.util.mongodb.service.UploadRealTimeMonitoringDataService;
import com.ruoyi.common.core.utils.WebUtils;
import com.ruoyi.common.core.web.domain.BasePojo;
import com.ruoyi.common.core.web.page.PageInfo;
@@ -285,7 +286,7 @@
        ChargingListQuery chargingListQuery = new ChargingListQuery();
        chargingListQuery.setUid(uid.getUid());
        chargingListQuery.setPageCurr(1);
        chargingListQuery.setPageSize(99999);
        chargingListQuery.setPageSize(9999999);
        ChargingBillVO data = chargingOrderClient.chargingBillListR(chargingListQuery).getData();
        List<ChargingBillVO> chargingBillVOS = new ArrayList<>();
@@ -308,8 +309,9 @@
            try (ExcelWriter excelWriter = excelWriterBuilder.withTemplate(stream).build()) {
                WriteSheet writeSheet = EasyExcel.writerSheet().build();
                FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.HORIZONTAL).build();
                FillConfig fillConfig2 = FillConfig.builder().direction(WriteDirectionEnum.VERTICAL).build();
                excelWriter.fill(new FillWrapper("data1", chargingBillVOS), fillConfig, writeSheet);
                excelWriter.fill(new FillWrapper("data2", data.getExportList()), fillConfig, writeSheet);
                excelWriter.fill(new FillWrapper("data2", data.getExportList()), fillConfig2, writeSheet);
                excelWriter.finish();
            } catch (Exception e) {
                return R.fail("excel导出失败!");
@@ -424,7 +426,7 @@
    @Resource
    private OtherClient otherClient;
    @Resource
    private UploadRealTimeMonitoringDataClient uploadRealTimeMonitoringDataClient;
    private UploadRealTimeMonitoringDataService uploadRealTimeMonitoringDataService;
    @ApiOperation(value = "下载", tags = {"管理后台-结算表记录"})
    @PutMapping("/downloadSettlement")
    @Log(title = "【结算表记录】下载结算表", businessType = BusinessType.EXPORT)
@@ -455,6 +457,8 @@
                        settlementExportVO.setVehicleBrand(data5.get(0).getVehicleBrand());
                    }
                }else{
                    settlementExportVO.setLicensePlate(chargingOrder.getPlateNum());
                }
                settlementExportVO.setSiteCode(data3.get(0).getCode());
                settlementExportVO.setSiteName(data3.get(0).getName());
@@ -556,7 +560,7 @@
            settlementExportVO.setAverageServiceChargeReal("");
            settlementExportVO.setAverageServiceCharge("");
            // 获取充电时间
            UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrder.getCode()).getData();
            UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataService.getLastDataById(chargingOrder.getCode());
            if (data5!=null){
                if (data5.getCumulative_charging_time()!=null){
                    settlementExportVO.setChargingSecond(data5.getCumulative_charging_time()+"");
@@ -565,7 +569,7 @@
            }
            // 获取开始SOC 结束soc
            if (chargingOrder.getCode()!=null){
                List<UploadRealTimeMonitoringData> data6 = uploadRealTimeMonitoringDataClient.getDataByOrderCode(chargingOrder.getCode()).getData();
                List<UploadRealTimeMonitoringData> data6 = uploadRealTimeMonitoringDataService.getDataByOrderCode(chargingOrder.getCode());
                if (data6!=null && !data6.isEmpty()){
                    int min = 100;
                    int max = 0;
@@ -666,7 +670,7 @@
        ChargingListQuery chargingListQuery = new ChargingListQuery();
        chargingListQuery.setUid(uid.getUid());
        chargingListQuery.setPageCurr(1);
        chargingListQuery.setPageSize(99999);
        chargingListQuery.setPageSize(9999999);
        ChargingBillVO data = chargingOrderClient.chargingBillListR(chargingListQuery).getData();
        List<ChargingBillVO> chargingBillVOS = new ArrayList<>();