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

lxw

2022-12-02 b0dd3c0fb9a2ff0666b27e6677ff7411245d334f

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

@@ -46,31 +46,56 @@
        int resGoodCount = 0;
        int volGoodCount = 0;
        int chainResGoodCount = 0;
        //总体评价:有效的电阻/电压/连接条 数
        int battVolTestCount = 0;
        int battResTestCount = 0;
        int battChainResTestCount = 0;
        FileParam fileParam = info.getFileParam();
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

        fileParam.setTestTimeStr(format.format(fileParam.getTestTime()));
        List<BattgroupData> dataList = info.getDataList();
        for(BattgroupData data : dataList){
            //计算电压,内阻,连接条数值是否有效,被测试过
            float bv = Float.parseFloat(data.getBv());
            float br = Float.parseFloat(data.getBr());
            float cr = Float.parseFloat(data.getCr());
            if (bv!=0.0){
                battVolTestCount++;
            }
            if(br!=0.0){
                battResTestCount++;
            }
            if (cr!=0.0){
                battChainResTestCount++;
            }

            data.setMonNumStr("#"+data.getMonNum());
            if(!data.isHighResFlag1() && !data.isHighResFlag2()){
            if(br==0.0){
                data.setResEvaluation("—");
            }
            else if(!data.isHighResFlag1() && !data.isHighResFlag2()){
                resGoodCount +=1;
                data.setResEvaluation("优");
            }else if(data.isHighResFlag1()){
                data.setResEvaluation("差");
                data.setResEvaluation("良");
            }else{
                data.setResEvaluation("很差");
                data.setResEvaluation("差");
            }
            if(!data.isLowVolFlag() && !data.isHighVolFlag()){
            if(bv!=0.0 && !data.isLowVolFlag() && !data.isHighVolFlag()){
                volGoodCount +=1;
            }
            if(!data.isHighChainResFlag1() && !data.isHighChainResFlag2()){
            if(cr!=0.0 && !data.isHighChainResFlag1() && !data.isHighChainResFlag2()){
                chainResGoodCount +=1;
            }
        };
        info.setResGoodCount(resGoodCount);
        info.setVolGoodCount(volGoodCount);
        info.setChainResGoodCount(chainResGoodCount);

        info.setBattVolTestCount(battVolTestCount);
        info.setBattResTestCount(battResTestCount);
        info.setBattChainResTestCount(battChainResTestCount);

        StationInfo stationInfo = info.getStationInfo();
        if(stationInfo!=null) {
@@ -186,20 +211,43 @@
        int resGoodCount = 0;
        int volGoodCount = 0;
        int chainResGoodCount = 0;

        //总体评价:有效的电阻/电压/连接条 数
        int battVolTestCount = 0;
        int battResTestCount = 0;
        int battChainResTestCount = 0;

        for(BattgroupData data : dataList2){
            //计算电压,内阻,连接条数值是否有效,被测试过
            float bv = Float.parseFloat(data.getBv());
            float br = Float.parseFloat(data.getBr());
            float cr = Float.parseFloat(data.getCr());
            if (bv!=0.0){
                battVolTestCount++;
            }
            if(br!=0.0){
                battResTestCount++;
            }
            if (cr!=0.0){
                battChainResTestCount++;
            }

            data.setMonNumStr("#"+data.getMonNum());
            if(!data.isHighResFlag1() && !data.isHighResFlag2()){
            if(br==0.0){
                data.setResEvaluation("—");
            }
            else if(!data.isHighResFlag1() && !data.isHighResFlag2() ){
                resGoodCount +=1;
                data.setResEvaluation("优");
            }else if(data.isHighResFlag1()){
                data.setResEvaluation("差");
                data.setResEvaluation("良");
            }else{
                data.setResEvaluation("很差");
                data.setResEvaluation("差");
            }
            if(!data.isLowVolFlag() && !data.isHighVolFlag()){
            if(bv!=0.0 && !data.isLowVolFlag() && !data.isHighVolFlag()){
                volGoodCount +=1;
            }
            if(!data.isHighChainResFlag1() && !data.isHighChainResFlag2()){
            if(cr!=0.0 && !data.isHighChainResFlag1() && !data.isHighChainResFlag2()){
                chainResGoodCount +=1;
            }
        };
@@ -207,6 +255,10 @@
        map.put("volGoodCount",volGoodCount);
        map.put("chainResGoodCount",chainResGoodCount);

        map.put("battVolTestCount",battVolTestCount);
        map.put("battResTestCount",battResTestCount);
        map.put("battChainResTestCount",battChainResTestCount);

        map.put("dataList",dataList);
        map.put("dataList2",dataList2);