lxw
2023-05-24 b3483a201b9d714c18785e5f2e831e6588a4153f
导出中英文切换放电类型
2个文件已修改
10 ■■■■■ 已修改文件
src/main/java/com/whyc/service/BattRtstateService.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/EchartPictureDowloadService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BattRtstateService.java
@@ -11,6 +11,7 @@
import com.whyc.pojo.Battinf;
import com.whyc.pojo.UserInf;
import com.whyc.util.ActionUtil;
import com.whyc.util.MessageUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -33,10 +34,11 @@
    public Response searchBattLife(int pageNum, int pageSize, Battinf binf) {
        PageHelper.startPage(pageNum, pageSize);
        UserInf userInf = ActionUtil.getUser();
        String lang = ActionUtil.getLang();
        List<BattState> list = battRtstateMapper.searchBattLife(binf, userInf.getUId().intValue());
        for (BattState bs : list) {
            Battinf battinf = bs.getBinf();
            battinf.setStationName9(BattTestData.battState(battinf.getNum()));
            battinf.setStationName9(MessageUtils.getMessageSocket(BattTestData.battState(battinf.getNum()), lang));
        }
        PageInfo<BattState> pageInfo = new PageInfo<>(list);
        return new Response().set(1, pageInfo, "查询成功");
src/main/java/com/whyc/service/EchartPictureDowloadService.java
@@ -1353,7 +1353,7 @@
                rownum++;
                sheet1.createRow(rownum);
                sheet1.getRow(rownum).createCell(1).setCellValue("测试类型:" + BattTestData.battState(bmd.getSdata().getTestType()));
                sheet1.getRow(rownum).createCell(1).setCellValue("测试类型:" + MessageUtils.getMessageSocket(BattTestData.battState(bmd.getSdata().getTestType()), lang));
                sheet1.getRow(rownum).createCell(2).setCellValue("测试时间:" + formartDate(bmd.getSdata().getTestStarttime(), "yyyy-MM-dd HH:mm:ss"));
                //sheet1.getRow(rownum).createCell(3).setCellValue("测试电流:" + bmd.getSdata().getTestCurr() + "A");
                sheet1.getRow(rownum).createCell(3).setCellValue("测试电流:" + testCurr + "A");
@@ -1416,7 +1416,7 @@
                rownum++;
                sheet1.createRow(rownum);
                sheet1.getRow(rownum).createCell(1).setCellValue("Test Type:" + BattTestData.battState(bmd.getSdata().getTestType()));
                sheet1.getRow(rownum).createCell(1).setCellValue("Test Type:" + MessageUtils.getMessageSocket(BattTestData.battState(bmd.getSdata().getTestType()), lang));
                sheet1.getRow(rownum).createCell(2).setCellValue("Test Time:" + formartDate(bmd.getSdata().getTestStarttime(), "yyyy-MM-dd HH:mm:ss"));
                sheet1.getRow(rownum).createCell(3).setCellValue("Test Curr:" + testCurr + "A");
                sheet1.getRow(rownum).createCell(4).setCellValue("Test TimeLong:" + formatTestLong(bmd.getSdata().getTestTimelong()));
@@ -1607,7 +1607,7 @@
                rownum++;
                sheet1.createRow(rownum);
                sheet1.getRow(rownum).createCell(1).setCellValue("测试类型:" + BattTestData.battState(bmd.getSdata().getTestType()));
                sheet1.getRow(rownum).createCell(1).setCellValue("测试类型:" + MessageUtils.getMessageSocket(BattTestData.battState(bmd.getSdata().getTestType()), lang));
                sheet1.getRow(rownum).createCell(2).setCellValue("测试时间:" + formartDate(bmd.getSdata().getTestStarttime(), "yyyy-MM-dd HH:mm:ss"));
                //sheet1.getRow(rownum).createCell(3).setCellValue("测试电流:" + bmd.getSdata().getTestCurr() + "A");
                sheet1.getRow(rownum).createCell(3).setCellValue("测试电流:" + testCurr + "A");