审批页面修改

lxw

2023-08-15 160e150009b51a39fa95d9462c3798ba28d51a09

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

@@ -66,7 +66,7 @@
            battTestDataInf.setAlarmLowCoe4CapAlarm(alarmLowCoe4CapAlarm);
            battTestDataInf.setAlarmLowCoe4CapChange(alarmLowCoe4CapChange);
            //获取测试仪表类型
            battTestDataInf.setTeststarttypeHex(TestDaoFactory.getTest_starttypeHex(battTestDataInf.getTestStarttype(), battTestDataInf.getTestType()));
            battTestDataInf.setTeststarttypeHex(TestDaoFactory.getTest_starttypeHex(battTestDataInf.getTestStarttype(), battTestDataInf.getTestType(), battTestDataInf.getTestDatatype()));

            //通过stop表获取落后单体信息
            String exist = commonMapper.existTable("db_batt_testdata", "tb_batttestdatastop_" + battTestDataInf.getBattGroupId());
@@ -88,7 +88,7 @@
        List<BatttestdataInf> calcDataList = new LinkedList<>();
        //查询电池组 电池信息或者电导信息
        PageHelper.startPage(pageNum, pageSize, true);
        List<BatttestdataInf> battTestInfList = mapper.getTestInfList(paramDto);
        List<BatttestdataInf> battTestInfList = mapper.getTestInfList1(paramDto);
        PageInfo<BatttestdataInf> pageInfo = new PageInfo(battTestInfList);

        //查询电池测试过程具体电池组的落后单体相关信息
@@ -102,7 +102,7 @@
                battTestDataInf.setAlarmLowCoe4CapAlarm(alarmLowCoe4CapAlarm);
                battTestDataInf.setAlarmLowCoe4CapChange(alarmLowCoe4CapChange);
                //获取测试仪表类型
                battTestDataInf.setTeststarttypeHex(TestDaoFactory.getTest_starttypeHex(battTestDataInf.getTestStarttype(), battTestDataInf.getTestType()));
                battTestDataInf.setTeststarttypeHex(TestDaoFactory.getTest_starttypeHex1(battTestDataInf.getTestStarttype(), battTestDataInf.getTestType()));

                //通过stop表获取落后单体信息
                String exist = commonMapper.existTable("db_batt_testdata", "tb_batttestdatastop_" + battTestDataInf.getBattGroupId());