环境试验后面再按照冲水试验和振动试验进行排序

zss

2024-11-18 50b3137d08c6535367bfa9144d18329120dd51bb

环境试验后面再按照冲水试验和振动试验进行排序

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

@@ -154,7 +154,27 @@
                }
            }
            // 比较位置
            return Integer.compare(index1, index2);
            int compareResult = Integer.compare(index1, index2);
            // 如果是环境试验，且两个对象在主检验项目上排序相同，则用次级检验项目排序
            if (compareResult == 0 && order[index1].equals("环境试验")) {
                String[] subOrder = {"冲水试验", "振动试验"};
                int subIndex1 = -1;
                int subIndex2 = -1;
                for (int i = 0; i < subOrder.length; i++) {
                    if (o1.getInspectionItemSubclass().equals(subOrder[i])) {
                        subIndex1 = i;
                    }
                    if (o2.getInspectionItemSubclass().equals(subOrder[i])) {
                        subIndex2 = i;
                    }
                    if (subIndex1 != -1 && subIndex2 != -1) {
                        break; // 两个次级位置都找到了，可以退出循环
                    }
                }
                compareResult = Integer.compare(subIndex1, subIndex2);
            }
            // 比较位置
            return compareResult;
        };
        // 对列表进行排序
        Collections.sort(list, testTypeComparator);

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

@@ -28,8 +28,6 @@

import javax.annotation.Resource;
import java.io.*;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

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

@@ -25,6 +25,7 @@
import org.openxmlformats.schemas.wordprocessingml.x2006.main.STMerge;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.io.*;
import java.nio.file.Files;
@@ -1486,22 +1487,13 @@
                lable.getAndIncrement();
            });
        });
        String url;
        try {
            ZipSecureFile.setMinInflateRatio(0.0001);
            InputStream inputStream = this.getClass().getResourceAsStream("/static/word1.docx");
            File file = File.createTempFile("temp", ".tmp");
            OutputStream outputStream = new FileOutputStream(file);
            IOUtils.copy(inputStream, outputStream);
            url = file.getAbsolutePath();
        } catch (FileNotFoundException e) {
            throw new ErrorException("找不到模板文件");
        } catch (IOException e) {
            throw new RuntimeException(e);
        }

        ZipSecureFile.setMinInflateRatio(0.0001);
        InputStream inputStream = this.getClass().getResourceAsStream("/static/word1.docx");

        ConfigureBuilder builder = Configure.builder();
        builder.useSpringEL(true);
        XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
        XWPFTemplate template = XWPFTemplate.compile(inputStream, builder.build()).render(
                new HashMap<String, Object>() {{
                    put("title", title);
                    put("tables", tables);
@@ -1974,8 +1966,7 @@
                    getWord1(insOrderUser.getTerm(), orderState, insSamples, tables2);
                }
            }
        }
        else {
        } else {
            //如果只有环境试验没有电路试验
            strings.remove("近场");
            strings.remove("远场");
@@ -2090,20 +2081,8 @@
                tables4.add(table4);
            }
        }

        String url;
        try {
            ZipSecureFile.setMinInflateRatio(0.0001);
            InputStream inputStream = this.getClass().getResourceAsStream("/static/report-template.docx");
            File file = File.createTempFile("temp", ".tmp");
            OutputStream outputStream = new FileOutputStream(file);
            IOUtils.copy(inputStream, outputStream);
            url = file.getAbsolutePath();
        } catch (FileNotFoundException e) {
            throw new ErrorException("找不到模板文件");
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
        ZipSecureFile.setMinInflateRatio(0.0001);
        InputStream inputStream = this.getClass().getResourceAsStream("/static/report-template.docx");
        StringBuilder standardMethod2 = new StringBuilder();
        for (String s : standardMethod) {
            standardMethod2.append("；\n").append(s);
@@ -2181,7 +2160,7 @@
            title3 = "辐射方向图参数";
        }
        String finalTitle = title3;
        XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
        XWPFTemplate template = XWPFTemplate.compile(inputStream, builder.build()).render(
                new HashMap<String, Object>() {{
                    put("order", insOrder);
                    put("report", insReport);