lxw
2022-10-26 6eabba8dec8c7d7e6f858f2c6dbccd30a9a775ca
src/main/java/com/whyc/service/ExcelExportService.java
@@ -74,18 +74,22 @@
        map.put("dto", info);
        //图片
        BASE64Decoder decoder = new BASE64Decoder();
        ImageEntity volImage = new ImageEntity();
        volImage.setData(decoder.decodeBuffer(info.getVolPic().substring(info.getVolPic().indexOf(",")+1)));
        volImage.setColspan(6);
        volImage.setRowspan(17);
        if(!info.getVolPic().equals("")) {
            ImageEntity volImage = new ImageEntity();
            volImage.setData(decoder.decodeBuffer(info.getVolPic().substring(info.getVolPic().indexOf(",") + 1)));
            volImage.setColspan(6);
            volImage.setRowspan(17);
        ImageEntity resImage = new ImageEntity();
        resImage.setData(decoder.decodeBuffer(info.getResPic().substring(info.getResPic().indexOf(",")+1)));
        resImage.setColspan(6);
        resImage.setRowspan(16);
            map.put("volImage",volImage);
        }
        if(!info.getResPic().equals("")) {
            ImageEntity resImage = new ImageEntity();
            resImage.setData(decoder.decodeBuffer(info.getResPic().substring(info.getResPic().indexOf(",") + 1)));
            resImage.setColspan(6);
            resImage.setRowspan(16);
        map.put("volImage",volImage);
        map.put("resImage",resImage);
            map.put("resImage", resImage);
        }
        //map.put("volImage","volImage");
        //map.put("resImage","resImage");
@@ -140,18 +144,23 @@
        String testTimeStrBase = format.format(paramBase.getTestTime());
        //图片
        BASE64Decoder decoder = new BASE64Decoder();
        ImageEntity volImage = new ImageEntity();
        volImage.setData(decoder.decodeBuffer(dto.getVolPic().substring(dto.getVolPic().indexOf(",")+1)));
        volImage.setColspan(6);
        volImage.setRowspan(17);
        if(!dto.getVolPic().equals("")) {
            ImageEntity volImage = new ImageEntity();
            volImage.setData(decoder.decodeBuffer(dto.getVolPic().substring(dto.getVolPic().indexOf(",") + 1)));
            volImage.setColspan(6);
            volImage.setRowspan(17);
        ImageEntity resImage = new ImageEntity();
        resImage.setData(decoder.decodeBuffer(dto.getResPic().substring(dto.getResPic().indexOf(",")+1)));
        resImage.setColspan(6);
        resImage.setRowspan(16);
            map.put("volImage",volImage);
        }
        map.put("volImage",volImage);
        map.put("resImage",resImage);
        if(!dto.getResPic().equals("")) {
            ImageEntity resImage = new ImageEntity();
            resImage.setData(decoder.decodeBuffer(dto.getResPic().substring(dto.getResPic().indexOf(",") + 1)));
            resImage.setColspan(6);
            resImage.setRowspan(16);
            map.put("resImage",resImage);
        }
        map.put("fileParam",param);
        map.put("stationInfo",stationInfo);