如果其他检验不检也可以生成报告结束试验跳过

zss

9 天以前 0ed3d6d60ece4effae6072556165a0aad9fe8f9f

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

@@ -2590,6 +2590,7 @@
        SampleProductDto insSample = insSampleMapper.selectSampleProductListByOrderId(insReportDto1.getSampleId());
        SampleProductDto s = insSample;
        List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
                .isNotNull(InsProduct::getInsResult)
                .eq(InsProduct::getInsSampleId, insSample.getId())
                .eq(InsProduct::getState, 1));
        /*首页*/
@@ -4771,7 +4772,11 @@
                                        String[] value = result2s.get(0).getValue().split("\\],\\[");
                                        String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
                                        String text = split[0];
                                        textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑7" + i);
                                        if (ObjectUtils.isEmpty(text)){
                                            textRenderData.setText("" + "∑7" + i);
                                        }else {
                                            textRenderData.setText(String.format("%.2f", Double.parseDouble(text)) + "∑7" + i);
                                        }
                                    }
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
@@ -4865,7 +4870,11 @@
                                        String[] value = result2s.get(0).getValue().split("\\],\\[");
                                        String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
                                        String text = split[0];
                                        textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑7" + i);
                                        if (ObjectUtils.isEmpty(text)){
                                            textRenderData.setText("" + "∑7" + i);
                                        }else {
                                            textRenderData.setText(String.format("%.2f", Double.parseDouble(text)) + "∑7" + i);
                                        }
                                    }
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);