近场报告解析添加指标+平均值保留两位小数+检测依据不加9410

zss

2025-02-27 032e88451cc03c781401e3feef14057f9cff6f94

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

@@ -845,8 +845,7 @@
                                    cells.add(cellRenderData);
                                }
                            }
                        }
                        else {
                        } else {
                            //电调版本(复杂版)
                            if (inspectionItemSubclass.contains("电压驻波比") && i <= (angles + 1) * portRow) {
                                cc = (angles + 1) * portRow;
@@ -2598,11 +2597,10 @@
        String[] monthNames = {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
        SampleProductDto s = insSample;
        models.add(s.getModel());
        standardMethod.addAll(standardMethodListMapper.selectList(Wrappers.<StandardMethodList>lambdaQuery()
                .in(StandardMethodList::getId, Arrays.stream(s.getStandardMethodListId().replaceAll("[\\[\\]]", "").split(","))
                        .map(String::trim).map(Integer::parseInt).collect(Collectors.toList()))).stream().map(aa -> {
            return aa.getCode() + " " + aa.getName();
        }).distinct().collect(Collectors.toList()));
        /*查询标准方法*/
        standardMethod.addAll(insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
                .eq(InsProduct::getInsSampleId, insSample.getId())
                .eq(InsProduct::getState, 1)).stream().map(InsProduct::getMethodS).distinct().collect(Collectors.toList()));
        //总数
        Long productCount = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
                .eq(InsProduct::getInsSampleId, s.getId()));
@@ -3076,7 +3074,6 @@
        for (String s1 : standardMethod) {
            standardMethod2.append("；\n").append(s1);
        }
        standardMethod2.append("；\n").append("GB/T 9410-2008 《移动通信天线通用技术规范》");
        standardMethod2.replace(0, 1, "");
        List<Map<String, String>> deviceList = null;
        if (deviceSet.size() != 0) {
@@ -4058,8 +4055,7 @@
                                    cells.add(cellRenderData);
                                }
                            }
                        }
                        else {
                        } else {
                            //电调版本(复杂版)
                            if (inspectionItemSubclass.contains("电压驻波比") && i <= (angles + 1) * portRow) {
                                cc = (angles + 1) * portRow;