whycxzp
2023-12-20 abf4ce6d752dccb6012f23f7a8d43a5bcd9ac60c
src/main/java/com/whyc/service/ExcelExportService.java
@@ -160,6 +160,7 @@
        }
        map.put("dto", info);
        //图片
        //电压柱状图
        BASE64Decoder decoder = new BASE64Decoder();
        if(!info.getVolPic().equals("")) {
            ImageEntity volImage = new ImageEntity();
@@ -169,6 +170,7 @@
            map.put("volImage",volImage);
        }
        //内阻柱状图
        if(!info.getResPic().equals("")) {
            ImageEntity resImage = new ImageEntity();
            resImage.setData(decoder.decodeBuffer(info.getResPic().substring(info.getResPic().indexOf(",") + 1)));
@@ -176,6 +178,24 @@
            resImage.setRowspan(16);
            map.put("resImage", resImage);
        }
        //电导柱状图
        if(!info.getCondPic().equals("")) {
            ImageEntity condImage = new ImageEntity();
            condImage.setData(decoder.decodeBuffer(info.getCondPic().substring(info.getCondPic().indexOf(",") + 1)));
            condImage.setColspan(6);
            condImage.setRowspan(16);
            map.put("condImage", condImage);
        }
        //链接条柱状图
        if(!info.getChainPic().equals("")) {
            ImageEntity chainImage = new ImageEntity();
            chainImage.setData(decoder.decodeBuffer(info.getChainPic().substring(info.getChainPic().indexOf(",") + 1)));
            chainImage.setColspan(6);
            chainImage.setRowspan(16);
            map.put("chainImage", chainImage);
        }
        //map.put("volImage","volImage");
@@ -205,11 +225,24 @@
        List<BattgroupData> dataList = (List<BattgroupData>) comparedList.getData();
        List<BattgroupData> dataList2 = (List<BattgroupData>) comparedList.getData2();
        Map<String,List<String>> data3 = (Map<String, List<String>>) comparedList.getData3();
        int baseSize = dataList.size();
        int size = dataList2.size();
        if(baseSize > size){
            dataList = dataList.subList(0,size);
        }else{
            dataList2 = dataList2.subList(0,baseSize);
        }
        //变化率
        List<String> resChangeRateList = data3.get("resChangeRate");
        List<String> volChangeRateList = data3.get("volChangeRate");
        map.put("resChangeRateList",resChangeRateList.subList(0,resChangeRateList.size()-1));
        map.put("volChangeRateList",volChangeRateList.subList(0,volChangeRateList.size()-1));
        /*map.put("resChangeRateList",resChangeRateList.subList(0,resChangeRateList.size()-1));
        map.put("volChangeRateList",volChangeRateList.subList(0,volChangeRateList.size()-1));*/
        map.put("resChangeRateList",resChangeRateList);
        map.put("volChangeRateList",volChangeRateList);
        map.put("volBalanceRateChangeRate",volChangeRateList.get(volChangeRateList.size()-1));
        map.put("resBalanceRateChangeRate",resChangeRateList.get(resChangeRateList.size()-1));