辐射试验近场生成报告优化,可以端口也可以P

zss

4 天以前 c47b351cc8e410993ed8cf1e27e3c50f7b52b371

 inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java

@@ -527,7 +527,7 @@
            Map<String, List<Map<String, Object>>> aggregatedMap = new HashMap<>();
            Map<String, List<Map<String, Object>>> o1 = (Map<String, List<Map<String, Object>>>) dataRow.get(result);
            for (String s2 : collect) {
                if (s2.contains("端口")) {
                if (s2.contains("端口")||s2.contains("P")) {
                    List<Map<String, Object>> mapList = o1.get(s2);
                    list.addAll(mapList);
                }
@@ -543,7 +543,7 @@
            }
            int rowNum = 2;
            for (String s2 : aggregatedMap.keySet()) {
                if (s2.equals("端口") || s2.equals("频率")) {
                if (s2.equals("端口") || s2.equals("频率") || s2.equals("P")) {
                    continue;
                }
                List<Map<String, Object>> mapList = aggregatedMap.get(s2);
@@ -629,7 +629,7 @@
                run9.setText("");
                for (int i = 0; i < collect.size(); i++) {
                    String s3 = collect.get(i);
                    if (s3.contains("端口")) {
                    if (s3.contains("端口") ||s3.contains("P")) {
                        XWPFParagraph paragraph10 = table1.getRow(rowNum + 1).getCell(5 + i).getParagraphArray(0);
                        paragraph10.setAlignment(ParagraphAlignment.CENTER);
                        XWPFRun run10 = paragraph10.createRun();
@@ -716,6 +716,9 @@
                    List<Map<String, Object>> mapList1 = group.get(aDouble);
                    for (Map<String, Object> stringObjectMap : mapList1) {
                        String port = stringObjectMap.get("端口").toString();
                        if (ObjectUtils.isNull(port)){
                            port = stringObjectMap.get("P").toString();
                        }
                        for (int i = 5; i < cell - 1; i++) {
                            String text = table1.getRow(rowNum + 1).getCell(i).getText();
                            if (text.equals(port)) {