feat(inspect): 新增新聚检验订单编辑功能并优化报告生成流程 - 新增 updateNewJuInsOrder 接口支持新聚检验订单修改 ...

liding

22 小时以前 82ce59218139d9fefeae7b9e5fbc88b499ff023f

 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java

@@ -75,6 +75,7 @@
import java.nio.file.Paths;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -83,7 +84,6 @@
import java.util.concurrent.atomic.AtomicReference;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;

/**
 * 检验任务-业务实现层
@@ -379,6 +379,9 @@

    @Override
    public int uploadFile(Integer orderId, MultipartFile file) {
        if (orderId == null || file == null || file.isEmpty()) {
            throw new ErrorException("请选择要上传的附件");
        }
        String urlString;
        String pathName;
        String path;
@@ -405,7 +408,7 @@
            urlString = realpath + "/" + pathName;
            file.transferTo(new File(urlString));
            insOrderFile.setFileUrl(pathName);
            return insOrderFileMapper.insert(insOrderFile);
            return insOrderFileMapper.insert(insOrderFile) > 0 ? insOrderFile.getId() : 0;
        } catch (Exception e) {
            e.printStackTrace();
            System.err.println("附件上传错误");
@@ -1683,8 +1686,9 @@
        boolean directTemplateOrder = isDirectTemplateOrder(orderId);
        if (currentState != null && Objects.equals(currentState.getInsState(), 5)
                && existingReport != null && StringUtils.isNotBlank(existingReport.getUrl())
                && Objects.equals(existingReport.getIsPass(), 1)
                && (!directTemplateOrder || StringUtils.isNotBlank(existingReport.getInspectionUrl()))) {
            // 防止复核页面重复点击或网络重试重复生成报告、重复发起报告审批。
            // 仅对仍在报告编制中的记录防重复；退回检验任务的报告需要继续执行并恢复 is_pass。
            return 1;
        }
        if (directTemplateOrder && Objects.equals(type, 1)
@@ -1963,10 +1967,12 @@
        if (StringUtils.isBlank(tempPdfName)) {
            throw new ErrorException("报告预览文件生成失败");
        }
        // generateReport 会写入当前时间；重新生成不应改变原审批记录时间。
        // generateReport 会写入当前时间，部分报告还会暂时写入 is_pass=0；
        // 重新生成不应改变原审批记录时间和可见状态。
        insReportMapper.update(null, Wrappers.<InsReport>lambdaUpdate()
                .eq(InsReport::getId, reportId)
                .set(InsReport::getWriteTime, report.getWriteTime())
                .set(InsReport::getIsPass, report.getIsPass())
                .set(InsReport::getTempUrlPdf, "/word/" + tempPdfName));
    }

@@ -3212,7 +3218,6 @@
        boolean showResult = Objects.equals(reportType, INSPECTION_REPORT);
        List<Map<String, Object>> tables = new ArrayList<>();
        Set<String> standardMethod = new LinkedHashSet<>();
        Set<String> deviceSet = new HashSet<>();
        Set<String> models = new HashSet<>();
        // 查询检验项数量
        AtomicInteger productSize = new AtomicInteger();
@@ -3230,17 +3235,6 @@
                    standardMethodCode = standardMethodCode + "+" + a.getSpecialStandardMethod();
                }
                standardMethod.add(standardMethodCode);
            }
            for (InsProduct b : a.getInsProduct()) {
                if (b.getInsProductResult() != null) {
                    List<JSONObject> jsonObjects = JSON.parseArray(b.getInsProductResult().getEquipValue(), JSONObject.class);
                    for (JSONObject jsonObject : jsonObjects) {
                        if (!"".equals(jsonObject.get("v") + "")) {
                            List<String> v = StrUtil.split(jsonObject.get("v") + "", "，");
                            deviceSet.addAll(v);
                        }
                    }
                }
            }
            // 直绑模板的检测报告、检验报告都使用新版固定结果行，不再进入旧版检验项表格逻辑。
            // 直绑模板中的承载记录没有旧检验项字段，进入旧逻辑会在格式化时产生空指针。
@@ -3271,28 +3265,6 @@
                }

                max = a.getQuantity();
                // 季度检验需要进厂检验的设备
                // 查询是否有进厂检验
                InsOrder order = insOrderMapper.selectOne(Wrappers.<InsOrder>lambdaQuery()
                        .eq(InsOrder::getIfsInventoryId, insOrder.getIfsInventoryId())
                        .ne(InsOrder::getState, -1)
                        .eq(InsOrder::getOrderType, InsOrderTypeConstants.ENTER_THE_FACTORY)
                        .ne(InsOrder::getId, insOrder.getId())
                        .last("limit 1"));
                if (order != null) {
                    List<SampleProductDto> sampleProductDtos = insSampleMapper.selectSampleProductListByOrderId(order.getId());
                    for (InsProduct b : sampleProductDtos.get(0).getInsProduct()) {
                        if (b.getInsProductResult() != null) {
                            List<JSONObject> jsonObjects = JSON.parseArray(b.getInsProductResult().getEquipValue(), JSONObject.class);
                            for (JSONObject jsonObject : jsonObjects) {
                                if (!"".equals(jsonObject.get("v") + "")) {
                                    List<String> v = StrUtil.split(jsonObject.get("v") + "", "，");
                                    deviceSet.addAll(v);
                                }
                            }
                        }
                    }
                }
                if (StringUtils.isBlank(insOrder.getSampleView())) {
                    insOrder.setSampleView(insOrder.getSample());
                }
@@ -3448,20 +3420,13 @@
        tables.forEach(table -> {
            table.put("tableSize", tables.size() + 1);
        });
        // 新订单按模板选择设备；旧订单没有模板设备关系时回退到订单级设备记录。
        Set<String> reportDeviceNumbers = insOrderTemplateDeviceMapper
                .selectManagementNumbersByOrderId(orderId).stream()
                .filter(StringUtils::isNotBlank)
        // 报告只展示检验单各模板选择的设备，并按设备ID去重。
        Set<Integer> reportDeviceIds = insOrderTemplateDeviceMapper
                .selectDeviceIdsByOrderId(orderId).stream()
                .filter(Objects::nonNull)
                .collect(Collectors.toCollection(LinkedHashSet::new));
        if (reportDeviceNumbers.isEmpty()) {
            reportDeviceNumbers.addAll(insOrderDeviceRecordMapper.selectDeviceNumber(orderId).stream()
                    .map(InsOrderDeviceRecordDto::getManagementNumber)
                    .filter(StringUtils::isNotBlank)
                    .collect(Collectors.toList()));
        }
        reportDeviceNumbers.addAll(deviceSet);
        List<Map<String, String>> deviceList = reportDeviceNumbers.isEmpty()
                ? new ArrayList<>() : insOrderMapper.selectDeviceList(reportDeviceNumbers);
        List<Map<String, String>> deviceList = reportDeviceIds.isEmpty()
                ? new ArrayList<>() : insOrderMapper.selectDeviceListByIds(reportDeviceIds);
        if (CollectionUtils.isNotEmpty(deviceList)) {
            int count = 1;
            for (Map<String, String> stringMap : deviceList) {
@@ -3562,30 +3527,20 @@
            sendTime = reportInventory.getDeclareDate();
        }

        // 检测日期：首次保存模板值时间-首次提交时间
        // 检测日期：汇总检验单各模板填写的检测时间，日期相同显示一个，否则显示最早至最晚。
        LocalDateTime now = LocalDateTime.now();
        // 提交时间
        LocalDateTime submitTime = LocalDateTime.now();
        // 判断是否有提交时间
        if (insOrder.getFirstSubmitDate() != null) {
            submitTime = insOrder.getFirstSubmitDate();
        }
        List<InsOrderStandardTemplate> templateSnapshots = insOrderStandardTemplateService.list(
                Wrappers.<InsOrderStandardTemplate>lambdaQuery()
                        .eq(InsOrderStandardTemplate::getInsOrderId, orderId)
                        .orderByAsc(InsOrderStandardTemplate::getSort, InsOrderStandardTemplate::getId));
        List<LocalDate> detectionDates = templateSnapshots.stream()
                .map(InsOrderStandardTemplate::getDetectionTime)
                .filter(Objects::nonNull)
                .collect(Collectors.toList());
        String insTime = formatReportTestDate(detectionDates);
        String insTimeEn = formatReportTestDateEn(detectionDates, monthNames);

        LocalDateTime firstInspectDate = insOrder.getFirstInspectDate();
        // 字段上线前的历史订单沿用原来的下发时间，避免改变既有报告口径。
        if (firstInspectDate == null) {
            firstInspectDate = insOrder.getSendTime();
        }
        if (firstInspectDate == null) {
            firstInspectDate = submitTime;
        }

        String insTime = formatReportTestDate(firstInspectDate, submitTime);

        String insTimeEn = monthNames[firstInspectDate.getMonthValue() - 1] + " " + firstInspectDate.format(DateTimeFormatter.ofPattern("dd, yyyy")) + "-"
                + monthNames[submitTime.getMonthValue() - 1] + " " + submitTime.format(DateTimeFormatter.ofPattern("dd, yyyy"));

        // 检验环境：优先汇总各模板填写的温湿度，报告展示全部模板的最小值到最大值。
        // 检验环境：优先汇总各模板填写的温度，报告展示全部模板的最小值到最大值。
        String environment = buildReportEnvironment(orderId, insOrder);
        String finalEnvironment = environment;
        LocalDateTime finalSendTime = sendTime;
@@ -3621,10 +3576,6 @@
            batchNo = defaultReportText(reportInventory.getUpdateBatchNo(), reportInventory.getLotBatchNo());
        }
        // 新聚直绑模板订单：报告信息取委托信息和订单模板快照，不再取能力范围标准方法。
        List<InsOrderStandardTemplate> templateSnapshots = insOrderStandardTemplateService.list(
                Wrappers.<InsOrderStandardTemplate>lambdaQuery()
                        .eq(InsOrderStandardTemplate::getInsOrderId, orderId)
                        .orderByAsc(InsOrderStandardTemplate::getSort, InsOrderStandardTemplate::getId));
        boolean newJuTemplateOrder = !templateSnapshots.isEmpty() && directTemplateOrder;
        if (newJuTemplateOrder) {
            productName = defaultReportText(insOrder.getSampleView(), insOrder.getSample());
@@ -3673,6 +3624,7 @@
        String finalResultRemark = resultRemark;
        String equipmentText = buildEquipmentText(finalDeviceList);
        String issueDate = now.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日"));
        String conclusionDate = now.format(DateTimeFormatter.ofPattern("yyyy 年 MM 月 dd 日"));
        String finalReportModelStr = finalModelStr;
        LocalDateTime finalReportSendTime = finalSendTime;
        XWPFTemplate template = XWPFTemplate.compile(inputStream, configure).render(
@@ -3716,6 +3668,7 @@
                    put("customer", finalCustomerName);
                    put("category", finalDetectionCategory);
                    put("date", issueDate);
                    put("conclusionDate", conclusionDate);
                    put("maker", defaultReportText(insOrder.getProduction(), "/"));
                    put("env", finalEnvironment);
                    put("qty", defaultReportText(insOrder.getTestQuantity(), "/"));
@@ -3945,11 +3898,22 @@
        for (Map<String, String> device : deviceList) {
            String name = getMapText(device, "deviceName", "device_name");
            String managementNumber = getMapText(device, "managementNumber", "management_number");
            String item = defaultReportText(name, "/");
            if (StringUtils.isNotBlank(managementNumber)) {
                item += "：" + managementNumber;
            String factoryNo = getMapText(device, "factoryNo", "factory_no");
            if (StringUtils.isBlank(name) || "/".equals(name.trim())) {
                continue;
            }
            String number = managementNumber;
            if (StringUtils.isBlank(number) || "/".equals(number.trim())) {
                number = factoryNo;
            }
            if (StringUtils.isBlank(number) || "/".equals(number.trim())) {
                continue;
            }
            String item = name.trim() + "：" + number.trim();
            equipmentItems.add(item);
        }
        if (equipmentItems.isEmpty()) {
            return "/";
        }
        List<String> items = new ArrayList<>(equipmentItems);
        List<String> lines = new ArrayList<>();
@@ -3964,22 +3928,12 @@
        List<InsOrderStandardTemplate> snapshots = insOrderStandardTemplateService.list(
                Wrappers.<InsOrderStandardTemplate>lambdaQuery()
                        .eq(InsOrderStandardTemplate::getInsOrderId, orderId)
                        .select(InsOrderStandardTemplate::getTemperature,
                                InsOrderStandardTemplate::getHumidity));
                        .select(InsOrderStandardTemplate::getTemperature));
        List<String> temperatures = snapshots.stream()
                .map(InsOrderStandardTemplate::getTemperature)
                .filter(StringUtils::isNotBlank)
                .collect(Collectors.toList());
        List<String> humidities = snapshots.stream()
                .map(InsOrderStandardTemplate::getHumidity)
                .filter(StringUtils::isNotBlank)
                .collect(Collectors.toList());

        String temperature = formatConditionRange(temperatures, order.getTemperature(), "℃");
        String humidity = formatConditionRange(humidities, order.getHumidity(), "%RH");
        return Stream.of(temperature, humidity)
                .filter(StringUtils::isNotBlank)
                .collect(Collectors.joining(" "));
        return formatConditionRange(temperatures, order.getTemperature(), "℃");
    }

    private static String formatConditionRange(List<String> values, String fallback, String unit) {
@@ -4049,12 +4003,31 @@
        return StringUtils.isNotBlank(fallback) ? fallback : "/";
    }

    private static String formatReportTestDate(LocalDateTime startTime, LocalDateTime endTime) {
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日");
        if (startTime.toLocalDate().equals(endTime.toLocalDate())) {
            return startTime.format(formatter);
    private static String formatReportTestDate(List<LocalDate> detectionDates) {
        if (CollectionUtils.isEmpty(detectionDates)) {
            return "/";
        }
        return startTime.format(formatter) + "至" + endTime.format(formatter);
        LocalDate startDate = Collections.min(detectionDates);
        LocalDate endDate = Collections.max(detectionDates);
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日");
        if (startDate.equals(endDate)) {
            return startDate.format(formatter);
        }
        return startDate.format(formatter) + "至" + endDate.format(formatter);
    }

    private static String formatReportTestDateEn(List<LocalDate> detectionDates, String[] monthNames) {
        if (CollectionUtils.isEmpty(detectionDates)) {
            return "/";
        }
        LocalDate startDate = Collections.min(detectionDates);
        LocalDate endDate = Collections.max(detectionDates);
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd, yyyy");
        String startText = monthNames[startDate.getMonthValue() - 1] + " " + startDate.format(formatter);
        if (startDate.equals(endDate)) {
            return startText;
        }
        return startText + "-" + monthNames[endDate.getMonthValue() - 1] + " " + endDate.format(formatter);
    }

    /**