Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/ResMeterMan...

he wei

2022-11-21 f590cd46b46d36610a3ed29591865de77d3e92ae

 src/main/java/com/whyc/service/ExcelExportService.java

@@ -64,7 +64,7 @@
            if(!data.isLowVolFlag() && !data.isHighVolFlag()){
                volGoodCount +=1;
            }
            if(!data.isHighChainResFlag()){
            if(!data.isHighChainResFlag1() && !data.isHighChainResFlag2()){
                chainResGoodCount +=1;
            }
        };
@@ -72,6 +72,14 @@
        info.setVolGoodCount(volGoodCount);
        info.setChainResGoodCount(chainResGoodCount);

        StationInfo stationInfo = info.getStationInfo();
        if(stationInfo!=null) {
            if (stationInfo.getStationName2().equals("-")) {
                stationInfo.setStationName(stationInfo.getStationName1());
            } else {
                stationInfo.setStationName(stationInfo.getStationName1() + "-" + stationInfo.getStationName2());
            }
        }
        map.put("dto", info);
        //图片
        BASE64Decoder decoder = new BASE64Decoder();
@@ -166,6 +174,12 @@
            map.put("resImage",resImage);
        }

        if(stationInfo.getStationName2().equals("-")){
            stationInfo.setStationName(stationInfo.getStationName1());
        }else{
            stationInfo.setStationName(stationInfo.getStationName1()+"-"+stationInfo.getStationName2());
        }

        map.put("fileParam",param);
        map.put("stationInfo",stationInfo);
        //总体评价:内阻/电压/连接条/?容量
@@ -185,7 +199,7 @@
            if(!data.isLowVolFlag() && !data.isHighVolFlag()){
                volGoodCount +=1;
            }
            if(!data.isHighChainResFlag()){
            if(!data.isHighChainResFlag1() && !data.isHighChainResFlag2()){
                chainResGoodCount +=1;
            }
        };