调整环境报告

zss

2025-02-28 174bc744cf0eca652c475edff3519eb9650f7553

调整环境报告

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

@@ -2622,18 +2622,20 @@
                while (matcher.find()) {
                    vValues.add(Long.parseLong(matcher.group(1)));
                }
                //不合格
                if (vValues.get(1)!=0){
                    productCount2 = productCount2 - 1 + vValues.get(1);
                if (vValues.size() > 0) {
                    //不合格
                    if (vValues.get(1) != 0) {
                        productCount2 = productCount2 - 1 + vValues.get(1);
                    }
                    //合格
                    if (vValues.get(0) != 0) {
                        if (fusheProduct.getInsResult() == 1) {
                            productCount3 = productCount3 - 1 + vValues.get(0);
                        } else productCount3 = productCount3 + vValues.get(0);
                    }
                    //总数=项目总数-辐射项目数量+辐射具体的(合格+不合格)数量
                    productCount = productCount - 1 + vValues.stream().mapToLong(Long::longValue).sum();
                }
                //合格
                if (vValues.get(0)!=0) {
                    if (fusheProduct.getInsResult()==1){
                        productCount3 = productCount3 - 1 + vValues.get(0);
                    }else  productCount3 = productCount3 + vValues.get(0);
                }
                //总数=项目总数-辐射项目数量+辐射具体的(合格+不合格)数量
                productCount = productCount - 1 + vValues.stream().mapToLong(Long::longValue).sum();
            }
        }
        productSize.set(productSize.get() + Integer.parseInt(productCount + ""));
@@ -2945,7 +2947,11 @@
                                //第三列
                                //获取检验项目和结论
                                InsProduct insProduct = products.get(i - 1);
                                textRenderData.setText("经过" + insProduct.getInspectionItemSubclass() + "之后，样品" + (insProduct.getInsResult() == 0 ? "不合格" : "无异常") + "。");
                                String shiyanjieguo = "无异常";
                                if (ObjectUtils.isNotNull(insProduct.getInsResult())) {
                                    shiyanjieguo = insProduct.getInsResult() == 0 ? "不合格" : "无异常";
                                }
                                textRenderData.setText("经过" + insProduct.getInspectionItemSubclass() + "之后，样品" +shiyanjieguo + "。");
                                renderData.add(textRenderData);
                                paragraphRenderData.setContents(renderData);
                                paragraphRenderDataList.add(paragraphRenderData);