电路试验,不同频段的要求值可以进行调整

zss

3 天以前 996c3fb89b185eedf2fd58a6c5bd5586e04cdccf

电路试验,不同频段的要求值可以进行调整

 inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProductResult2.java

@@ -81,4 +81,7 @@
     * 次数(检测次数)
     */
    private Integer num;

    @ApiModelProperty("要求值")
    private String ask;
}

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java

@@ -810,10 +810,12 @@
        List<InsProductResult2> result2s = new ArrayList<>();
        List<InsProductUser> insProductUsers = new ArrayList<>();
        for (InsProductResult2 insProductResult2 : insProductResultDtos.getInsProductResult2s()) {
            InsProduct insProduct = new InsProduct();
            insProduct.setId(insProductResult2.getInsProductId());//项目id
            InsProductResult2 result2 = new InsProductResult2();
            //要求值
            result2.setAsk(insProductResult2.getAsk());
            //次数
            result2.setNum(orderState.getNum());
            //关联项目id
            result2.setInsProductId(insProductResult2.getInsProductId());
            //频率
            result2.setFrequency(insProductResultDtos.getFrequency());
@@ -837,7 +839,7 @@
            if (insProductResult2.getEquipName() != null) {
                result2.setEquipName(insProductResult2.getEquipName());
            }
            insProduct = insProductMapper.selectById(insProduct.getId());
//            InsProduct insProduct = insProductMapper.selectById(insProductResult2.getInsProductId());
            //值
            if (insProductResult2.getValue() != null) {
                result2.setValue(insProductResult2.getValue());
@@ -845,15 +847,15 @@
                int ressult = 1;
                String valueStr = insProductResult2.getValue();
                String regex = "[\u4e00-\u9fa5]";
                if (!insProduct.getAsk().contains(",")) {
                    if (insProduct.getAsk().equals("/") || Pattern.compile(regex).matcher(insProduct.getAsk()).find()) {
                if (!insProductResult2.getAsk().contains(",")) {
                    if (insProductResult2.getAsk().equals("/") || Pattern.compile(regex).matcher(insProductResult2.getAsk()).find()) {
                        ressult = 3; //不判定
                    } else if (!isValueValid(valueStr, new String[]{insProduct.getAsk()})) {
                    } else if (!isValueValid(valueStr, new String[]{insProductResult2.getAsk()})) {
                        ressult = 0; //不合格
                    }
                } else {
                    // 如果要求值是(2°≥20,7°≥25,12°≥25)这种情况
                    String[] askParts = insProduct.getAsk().split(",");
                    String[] askParts = insProductResult2.getAsk().split(",");
                    String[] angles = insProductResult2.getAngle().split(",");
                    for (String s : askParts) {
                        String[] askSplit = s.split("°");
@@ -887,12 +889,7 @@
            result2.setCreateUser(userId);
            result2.setUpdateUser(userId);
            result2s.add(result2);
            //insProductResult2Mapper.insert(result2);
            //insProduct.setUpdateUser(userId);
            //insProducts.add(insProduct);
            //insProductMapper.updateById(insProduct);
            insProductUsers.add(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
            //insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
            insProductUsers.add(new InsProductUser(null, userId, LocalDateTime.now(), insProductResult2.getInsProductId()));
            /*更新样品的检验状态*/
            insSample.setInsState(1);
            Long l = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java

@@ -392,7 +392,10 @@
                .between(AuxiliaryOutputWorkingHours::getCreateTime, start, end));
        double sum = auxiliaryOutputWorkingHours.stream()
                .filter(auxiliaryOutputWorkingHours1 ->
                        insProductMapper.selectById(auxiliaryOutputWorkingHours1.getInsProductId()).getSonLaboratory().equals(sonLaboratory)
                        {
                            InsProduct insProduct = insProductMapper.selectById(auxiliaryOutputWorkingHours1.getInsProductId());
                            return ObjectUtils.isNotNull(insProduct)&&insProduct.getSonLaboratory().equals(sonLaboratory);
                        }
                ).mapToDouble(AuxiliaryOutputWorkingHours::getOutputWorkTime).sum();
        String num = String.format("%.2f", sum);
        return num;
@@ -410,7 +413,10 @@
        //根据检验项查出来的站点进行分类
        List<AuxiliaryOutputWorkingHours> outputWorkingHours = auxiliaryOutputWorkingHours.stream()
                .filter(auxiliaryOutputWorkingHours1 ->
                        insProductMapper.selectById(auxiliaryOutputWorkingHours1.getInsProductId()).getSonLaboratory().equals(sonLaboratory)
                        {
                            InsProduct insProduct = insProductMapper.selectById(auxiliaryOutputWorkingHours1.getInsProductId());
                            return ObjectUtils.isNotNull(insProduct)&&insProduct.getSonLaboratory().equals(sonLaboratory);
                        }
                ).collect(Collectors.toList());
        Map<Object, Double> mapMap = outputWorkingHours.stream()
                .collect(Collectors.groupingBy(

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

@@ -280,7 +280,7 @@
                    style.setFontFamily("宋体");
                    style.setColor("000000");
                    textRenderData.setStyle(style);
                    if (i == 1) {
                    if (i == 0) {
                        //第一行
                        textRenderData.setText("频段：" + s + "∑0" + lable);
                        renderData.add(textRenderData);
@@ -328,7 +328,7 @@
                                    cells.add(cellRenderData);
                                } else if (j == 3) {
                                    //第四列
                                    textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                    textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
@@ -430,7 +430,7 @@
                                    cells.add(cellRenderData);
                                } else if (j == 3) {
                                    //第四列
                                    textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                    textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
@@ -522,7 +522,7 @@
                                    cells.add(cellRenderData);
                                } else if (j == 3) {
                                    //第四列
                                    textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                    textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
@@ -614,7 +614,7 @@
                                    cells.add(cellRenderData);
                                } else if (j == 3) {
                                    //第四列
                                    textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                    textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
@@ -706,7 +706,7 @@
                                    cells.add(cellRenderData);
                                } else if (j == 3) {
                                    //第四列
                                    textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                    textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
@@ -797,7 +797,7 @@
                                    cells.add(cellRenderData);
                                } else if (j == 3) {
                                    //第四列
                                    textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                    textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
@@ -891,7 +891,7 @@
                                    cells.add(cellRenderData);
                                } else if (j == 3) {
                                    //第四列
                                    textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                    textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
@@ -997,7 +997,7 @@
                                        cells.add(cellRenderData);
                                    } else if (j == 3) {
                                        //第四列
                                        textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                        textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                        renderData.add(textRenderData);
                                        paragraphRenderData.setContents(renderData);
                                        paragraphRenderDataList.add(paragraphRenderData);
@@ -1120,7 +1120,7 @@
                                        cells.add(cellRenderData);
                                    } else if (j == 3) {
                                        //第四列
                                        textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                        textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                        renderData.add(textRenderData);
                                        paragraphRenderData.setContents(renderData);
                                        paragraphRenderDataList.add(paragraphRenderData);
@@ -1243,7 +1243,7 @@
                                        cells.add(cellRenderData);
                                    } else if (j == 3) {
                                        //第四列
                                        textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                        textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                        renderData.add(textRenderData);
                                        paragraphRenderData.setContents(renderData);
                                        paragraphRenderDataList.add(paragraphRenderData);
@@ -1366,7 +1366,7 @@
                                        cells.add(cellRenderData);
                                    } else if (j == 3) {
                                        //第四列
                                        textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                        textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                        renderData.add(textRenderData);
                                        paragraphRenderData.setContents(renderData);
                                        paragraphRenderDataList.add(paragraphRenderData);
@@ -1484,7 +1484,7 @@
                                    cells.add(cellRenderData);
                                } else if (j == 3) {
                                    //第四列
                                    textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                    textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
@@ -1581,7 +1581,7 @@
                                    cells.add(cellRenderData);
                                } else if (j == 3) {
                                    //第四列
                                    textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                    textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
@@ -1674,7 +1674,7 @@
                                    cells.add(cellRenderData);
                                } else if (j == 3) {
                                    //第四列
                                    textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                    textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
@@ -1771,7 +1771,7 @@
                                        cells.add(cellRenderData);
                                    } else if (j == 3) {
                                        //第四列
                                        textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                        textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                        renderData.add(textRenderData);
                                        paragraphRenderData.setContents(renderData);
                                        paragraphRenderDataList.add(paragraphRenderData);
@@ -1878,7 +1878,7 @@
                                        cells.add(cellRenderData);
                                    } else if (j == 3) {
                                        //第四列
                                        textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                        textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                        renderData.add(textRenderData);
                                        paragraphRenderData.setContents(renderData);
                                        paragraphRenderDataList.add(paragraphRenderData);
@@ -1985,7 +1985,7 @@
                                        cells.add(cellRenderData);
                                    } else if (j == 3) {
                                        //第四列
                                        textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                        textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                        renderData.add(textRenderData);
                                        paragraphRenderData.setContents(renderData);
                                        paragraphRenderDataList.add(paragraphRenderData);
@@ -2091,7 +2091,7 @@
                                        cells.add(cellRenderData);
                                    } else if (j == 3) {
                                        //第四列
                                        textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                        textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                        renderData.add(textRenderData);
                                        paragraphRenderData.setContents(renderData);
                                        paragraphRenderDataList.add(paragraphRenderData);
@@ -2209,81 +2209,81 @@
        }
        // 处理合并单元格的问题
        String path = wordUrl + "/" + url;
        try {
            ZipSecureFile.setMinInflateRatio(0.0001);
            FileInputStream stream = new FileInputStream(path);
            XWPFDocument document = new XWPFDocument(stream);
            List<XWPFTable> xwpfTables = document.getTables();
            for (int i = 0; i < xwpfTables.size(); i++) {
                Set<String> set1 = new HashSet<>();
                Map<String, Map<String, Integer>> maps = new HashMap<>();
                for (int j = 0; j < xwpfTables.get(i).getRows().size(); j++) {
                    for (int k = 0; k < xwpfTables.get(i).getRows().get(j).getTableCells().size(); k++) {
                        if (xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().indexOf("∑") > -1) {
                            String[] split = xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().split("∑");
                            if (set1.add(split[1])) {
                                Map<String, Integer> map = new HashMap<>();
                                map.put("sr", j);
                                map.put("sc", k);
                                map.put("er", j + 0);
                                map.put("ec", k + 0);
                                maps.put(split[1], map);
                            } else {
                                Map<String, Integer> map1 = maps.get(split[1]);
                                if (j == map1.get("sr")) {
                                    map1.put("ec", map1.get("ec") + 1);
                                } else if (k == map1.get("sc")) {
                                    map1.put("er", map1.get("er") + 1);
                                }
                            }
                            String str = xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().split("∑")[0];
                            xwpfTables.get(i).getRows().get(j).getTableCells().get(k).removeParagraph(0);
                            xwpfTables.get(i).getRows().get(j).getTableCells().get(k).setText(str);
                            xwpfTables.get(i).getRows().get(j).getTableCells().get(k).setVerticalAlignment(XWPFTableCell.XWPFVertAlign.CENTER);
                            xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getParagraphArray(0).setAlignment(org.apache.poi.xwpf.usermodel.ParagraphAlignment.CENTER);
                        }
                    }
                }

                // 单元格排序, 避免格式错乱
                List<Map.Entry<String, Map<String, Integer>>> entries = new ArrayList<>(maps.entrySet());
                entries.sort((o1, o2) -> o1.getValue().get("sc") - o2.getValue().get("sc"));

                // 按照顺序添加进集合
                List<String> list = new ArrayList<>();
                for (Map.Entry<String, Map<String, Integer>> entry : entries) {
                    list.add(entry.getKey());
                }
                /*List<String> list = new ArrayList<>();
                for (String s : maps.keySet()) {
                    list.add(s);
                }*/
                for (int a = list.size() - 1; a >= 0; a--) {
                    Map<String, Integer> v = maps.get(list.get(a));
                    for (int j = 0; j < v.get("er") - v.get("sr") + 1; j++) {
                        if (v.get("ec") > v.get("sc")) {
                            try {
                                TableTools.mergeCellsHorizonal(xwpfTables.get(i), v.get("sr") + j, v.get("sc"), v.get("ec"));
                            } catch (Exception e) {
                            }
                        }
                    }
                    if (v.get("er") > v.get("sr")) {
                        try {
                            TableTools.mergeCellsVertically(xwpfTables.get(i), v.get("sc"), v.get("sr"), v.get("er"));
                        } catch (Exception e) {
                        }
                    }
                }
            }
            FileOutputStream fileOutputStream = new FileOutputStream(path);
            document.write(fileOutputStream);
            fileOutputStream.close();
        } catch (FileNotFoundException e) {
            throw new RuntimeException(e);
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
//        try {
//            ZipSecureFile.setMinInflateRatio(0.0001);
//            FileInputStream stream = new FileInputStream(path);
//            XWPFDocument document = new XWPFDocument(stream);
//            List<XWPFTable> xwpfTables = document.getTables();
//            for (int i = 0; i < xwpfTables.size(); i++) {
//                Set<String> set1 = new HashSet<>();
//                Map<String, Map<String, Integer>> maps = new HashMap<>();
//                for (int j = 0; j < xwpfTables.get(i).getRows().size(); j++) {
//                    for (int k = 0; k < xwpfTables.get(i).getRows().get(j).getTableCells().size(); k++) {
//                        if (xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().indexOf("∑") > -1) {
//                            String[] split = xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().split("∑");
//                            if (set1.add(split[1])) {
//                                Map<String, Integer> map = new HashMap<>();
//                                map.put("sr", j);
//                                map.put("sc", k);
//                                map.put("er", j + 0);
//                                map.put("ec", k + 0);
//                                maps.put(split[1], map);
//                            } else {
//                                Map<String, Integer> map1 = maps.get(split[1]);
//                                if (j == map1.get("sr")) {
//                                    map1.put("ec", map1.get("ec") + 1);
//                                } else if (k == map1.get("sc")) {
//                                    map1.put("er", map1.get("er") + 1);
//                                }
//                            }
//                            String str = xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().split("∑")[0];
//                            xwpfTables.get(i).getRows().get(j).getTableCells().get(k).removeParagraph(0);
//                            xwpfTables.get(i).getRows().get(j).getTableCells().get(k).setText(str);
//                            xwpfTables.get(i).getRows().get(j).getTableCells().get(k).setVerticalAlignment(XWPFTableCell.XWPFVertAlign.CENTER);
//                            xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getParagraphArray(0).setAlignment(org.apache.poi.xwpf.usermodel.ParagraphAlignment.CENTER);
//                        }
//                    }
//                }
//
//                // 单元格排序, 避免格式错乱
//                List<Map.Entry<String, Map<String, Integer>>> entries = new ArrayList<>(maps.entrySet());
//                entries.sort((o1, o2) -> o1.getValue().get("sc") - o2.getValue().get("sc"));
//
//                // 按照顺序添加进集合
//                List<String> list = new ArrayList<>();
//                for (Map.Entry<String, Map<String, Integer>> entry : entries) {
//                    list.add(entry.getKey());
//                }
//                /*List<String> list = new ArrayList<>();
//                for (String s : maps.keySet()) {
//                    list.add(s);
//                }*/
//                for (int a = list.size() - 1; a >= 0; a--) {
//                    Map<String, Integer> v = maps.get(list.get(a));
//                    for (int j = 0; j < v.get("er") - v.get("sr") + 1; j++) {
//                        if (v.get("ec") > v.get("sc")) {
//                            try {
//                                TableTools.mergeCellsHorizonal(xwpfTables.get(i), v.get("sr") + j, v.get("sc"), v.get("ec"));
//                            } catch (Exception e) {
//                            }
//                        }
//                    }
//                    if (v.get("er") > v.get("sr")) {
//                        try {
//                            TableTools.mergeCellsVertically(xwpfTables.get(i), v.get("sc"), v.get("sr"), v.get("er"));
//                        } catch (Exception e) {
//                        }
//                    }
//                }
//            }
//            FileOutputStream fileOutputStream = new FileOutputStream(path);
//            document.write(fileOutputStream);
//            fileOutputStream.close();
//        } catch (FileNotFoundException e) {
//            throw new RuntimeException(e);
//        } catch (IOException e) {
//            throw new RuntimeException(e);
//        }
        InsOrderFile insOrderFile = new InsOrderFile();
        insOrderFile.setInsOrderId(insOrderState.getInsOrderId());
        insOrderFile.setInsSampleId(insOrderState.getInsSampleId());
@@ -3449,7 +3449,7 @@
                                    cells.add(cellRenderData);
                                } else if (j == 3) {
                                    //第四列
                                    textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                    textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
@@ -3554,7 +3554,7 @@
                                    cells.add(cellRenderData);
                                } else if (j == 3) {
                                    //第四列
                                    textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                    textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
@@ -3648,7 +3648,7 @@
                                    cells.add(cellRenderData);
                                } else if (j == 3) {
                                    //第四列
                                    textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                    textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
@@ -3742,7 +3742,7 @@
                                    cells.add(cellRenderData);
                                } else if (j == 3) {
                                    //第四列
                                    textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                    textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
@@ -3836,7 +3836,7 @@
                                    cells.add(cellRenderData);
                                } else if (j == 3) {
                                    //第四列
                                    textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                    textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
@@ -3929,7 +3929,7 @@
                                    cells.add(cellRenderData);
                                } else if (j == 3) {
                                    //第四列
                                    textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                    textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
@@ -4024,7 +4024,7 @@
                                    cells.add(cellRenderData);
                                } else if (j == 3) {
                                    //第四列
                                    textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                    textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
@@ -4130,7 +4130,7 @@
                                        cells.add(cellRenderData);
                                    } else if (j == 3) {
                                        //第四列
                                        textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                        textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                        renderData.add(textRenderData);
                                        paragraphRenderData.setContents(renderData);
                                        paragraphRenderDataList.add(paragraphRenderData);
@@ -4255,7 +4255,7 @@
                                        cells.add(cellRenderData);
                                    } else if (j == 3) {
                                        //第四列
                                        textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                        textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                        renderData.add(textRenderData);
                                        paragraphRenderData.setContents(renderData);
                                        paragraphRenderDataList.add(paragraphRenderData);
@@ -4380,7 +4380,7 @@
                                        cells.add(cellRenderData);
                                    } else if (j == 3) {
                                        //第四列
                                        textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                        textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                        renderData.add(textRenderData);
                                        paragraphRenderData.setContents(renderData);
                                        paragraphRenderDataList.add(paragraphRenderData);
@@ -4505,7 +4505,7 @@
                                        cells.add(cellRenderData);
                                    } else if (j == 3) {
                                        //第四列
                                        textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                        textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                        renderData.add(textRenderData);
                                        paragraphRenderData.setContents(renderData);
                                        paragraphRenderDataList.add(paragraphRenderData);
@@ -4625,7 +4625,7 @@
                                    cells.add(cellRenderData);
                                } else if (j == 3) {
                                    //第四列
                                    textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                    textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
@@ -4723,7 +4723,7 @@
                                    cells.add(cellRenderData);
                                } else if (j == 3) {
                                    //第四列
                                    textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                    textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
@@ -4821,7 +4821,7 @@
                                    cells.add(cellRenderData);
                                } else if (j == 3) {
                                    //第四列
                                    textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                    textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
@@ -4923,7 +4923,7 @@
                                        cells.add(cellRenderData);
                                    } else if (j == 3) {
                                        //第四列
                                        textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                        textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                        renderData.add(textRenderData);
                                        paragraphRenderData.setContents(renderData);
                                        paragraphRenderDataList.add(paragraphRenderData);
@@ -5031,7 +5031,7 @@
                                        cells.add(cellRenderData);
                                    } else if (j == 3) {
                                        //第四列
                                        textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                        textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                        renderData.add(textRenderData);
                                        paragraphRenderData.setContents(renderData);
                                        paragraphRenderDataList.add(paragraphRenderData);
@@ -5139,7 +5139,7 @@
                                        cells.add(cellRenderData);
                                    } else if (j == 3) {
                                        //第四列
                                        textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                        textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                        renderData.add(textRenderData);
                                        paragraphRenderData.setContents(renderData);
                                        paragraphRenderDataList.add(paragraphRenderData);
@@ -5246,7 +5246,7 @@
                                        cells.add(cellRenderData);
                                    } else if (j == 3) {
                                        //第四列
                                        textRenderData.setText(products.get(0).getAsk() + "∑4" + index);
                                        textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "∑4" + index);
                                        renderData.add(textRenderData);
                                        paragraphRenderData.setContents(renderData);
                                        paragraphRenderDataList.add(paragraphRenderData);

 inspect-server/src/main/resources/mapper/InsProductResult2Mapper.xml

@@ -13,6 +13,7 @@
        <result column="update_time" property="updateTime"/>
        <result column="frequency" property="frequency"/>
        <result column="often" property="often"/>
        <result column="ask" property="ask"/>
        <result column="port" property="port"/>
        <result column="angle" property="angle"/>
        <result column="value" property="value"/>
@@ -20,7 +21,7 @@
    </resultMap>
    <insert id="saveBatch">
        INSERT INTO ins_product_result_2 (ins_product_id, equip_value, equip_name,
        frequency, port, angle, value, result, often, num)
        frequency, port,ask, angle, value, result, often, num)
        VALUES
        <foreach collection="result2s" item="result2" separator=",">
            ( #{result2.insProductId},
@@ -28,6 +29,7 @@
             #{result2.equipName},
             #{result2.frequency},
             #{result2.port},
            #{result2.ask},
             #{result2.angle},
             #{result2.value},
             #{result2.result},
@@ -39,7 +41,8 @@
        select
        inspection_item_subclass,
        unit,
        ask,
        case when ipr2.ask is null then ip.ask
        else ipr2.ask end as ask,
        result,
        frequency,
        port,

 inspect-server/src/main/resources/mapper/InsSampleMapper.xml

@@ -257,7 +257,7 @@
               method,
               man_day,
               bsm,
               ask,
               ip.ask,
               `last_value`,
               ip.ins_result    ip_ins_result,
               state,
@@ -277,6 +277,7 @@
               ipr.after_note,
               ipr.test_result,
               ipr2.frequency,
               ipr2.ask ask2,
               ipr2.often,
               ipr2.port,
               ipr2.angle,
@@ -330,7 +331,7 @@
               method,
               man_day,
               bsm,
               ask,
               ip.ask,
               `last_value`,
               ip.ins_result    ip_ins_result,
               state,
@@ -350,6 +351,7 @@
               ipr.after_note,
               ipr.test_result,
               ipr2.frequency,
               ipr2.ask ask2,
               ipr2.often,
               ipr2.port,
               ipr2.angle,
@@ -533,7 +535,7 @@
               method,
               man_day,
               bsm,
               ask,
               ip.ask,
               `last_value`,
               ip.ins_result    ip_ins_result,
               state,
@@ -553,6 +555,7 @@
               ipr.after_note,
               ipr.test_result,
               ipr2.frequency,
               ipr2.ask  ask2,
               ipr2.often,
               ipr2.port,
               ipr2.angle,
@@ -604,7 +607,7 @@
               method,
               man_day,
               bsm,
               ask,
               ip.ask,
               `last_value`,
               ip.ins_result    ip_ins_result,
               state,
@@ -624,6 +627,7 @@
               ipr.after_note,
               ipr.test_result,
               ipr2.frequency,
               ipr2.ask ask2,
               ipr2.often,
               ipr2.port,
               ipr2.angle,
@@ -673,7 +677,7 @@
               method,
               man_day,
               bsm,
               ask,
               ip.ask,
               `last_value`,
               ip.ins_result    ip_ins_result,
               state,
@@ -693,6 +697,7 @@
               ipr.after_note,
               ipr.test_result,
               ipr2.frequency,
               ipr2.ask ask2,
               ipr2.often,
               ipr2.port,
               ipr2.angle,
@@ -837,6 +842,7 @@
    </resultMap>
    <resultMap id="insProductResult2" type="com.yuanchu.mom.pojo.InsProductResult2">
        <result column="frequency" property="frequency" jdbcType="VARCHAR"/>
        <result column="ask2" property="ask" jdbcType="VARCHAR"/>
        <result column="often" property="often" jdbcType="VARCHAR"/>
        <result column="port" property="port" jdbcType="VARCHAR"/>
        <result column="angle" property="angle" jdbcType="VARCHAR"/>