电路试验的驻波比csv报告解析2.0(加报告)+撤销项目还需要判断样品下的项目是不是全部都撤销了,如果都撤销了,样品也需要撤销

zss

2024-12-11 9b2837d4b844099f3b7536065ada857b136c1c92

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

@@ -106,14 +106,18 @@
                for (String s : list) {
                    String[] mHzs = s.split("MHz")[0].split("-");
                    //再判断这个频点是否在频段的范围内
                    if (Integer.parseInt(stringListEntry.getKey()) <= Integer.parseInt(mHzs[1]) && Integer.parseInt(stringListEntry.getKey()) >= Integer.parseInt(mHzs[0])) {
                    if (stringListEntry.getKey().equals("700")){
                        insProductResult2.setFrequency("703-803MHz");
                        break;
                    }
                    else if (Integer.parseInt(stringListEntry.getKey()) <= Integer.parseInt(mHzs[1]) && Integer.parseInt(stringListEntry.getKey()) >= Integer.parseInt(mHzs[0])) {
                        insProductResult2.setFrequency(s);
                        break;
                    }
                }
                if (ObjectUtils.isEmpty(insProductResult2.getFrequency())) {
                    throw new ErrorException("没有找到" + stringListEntry.getKey() + "对应的频段");
                }
            }
            if (ObjectUtils.isEmpty(insProductResult2.getFrequency())) {
                throw new ErrorException("没有找到" + stringListEntry.getKey() + "对应的频段信息,请先选择频段信息进行保存");
            }
            insProductResult2s.add(insProductResult2);
        }
@@ -303,8 +307,7 @@
                filteredList.add(result2);
            }
        }
        System.out.println(filteredList);
        //insProductResult2Service.saveBatch(filteredList);
        insProductResult2Service.saveBatch(filteredList);
    }