From 558bc1aefef8a4b99b6469e3241fc496f4c3749c Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Wed, 19 Aug 2026 17:14:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BAlabel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/ProofTrackingBuProcessConfigData.java | 6 ++++++ .../service/impl/SampleProofTrackingServiceImpl.java | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/src/main/java/com/xujie/sys/modules/sampletracking/data/ProofTrackingBuProcessConfigData.java b/src/main/java/com/xujie/sys/modules/sampletracking/data/ProofTrackingBuProcessConfigData.java index 113b1bba..5232a938 100644 --- a/src/main/java/com/xujie/sys/modules/sampletracking/data/ProofTrackingBuProcessConfigData.java +++ b/src/main/java/com/xujie/sys/modules/sampletracking/data/ProofTrackingBuProcessConfigData.java @@ -3,6 +3,7 @@ package com.xujie.sys.modules.sampletracking.data; import lombok.Data; import java.util.List; +import java.util.Map; /** * 事业部进度展示配置 @@ -40,6 +41,11 @@ public class ProofTrackingBuProcessConfigData { */ private List processOrderCodes; + /** + * 前端字段:工序编码与显示名称映射,避免配置中仅有编码时回显为 value。 + */ + private Map processLabelMap; + private String createBy; private String updateBy; } diff --git a/src/main/java/com/xujie/sys/modules/sampletracking/service/impl/SampleProofTrackingServiceImpl.java b/src/main/java/com/xujie/sys/modules/sampletracking/service/impl/SampleProofTrackingServiceImpl.java index 2739e8d3..eb2557c3 100644 --- a/src/main/java/com/xujie/sys/modules/sampletracking/service/impl/SampleProofTrackingServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/sampletracking/service/impl/SampleProofTrackingServiceImpl.java @@ -1095,6 +1095,16 @@ public class SampleProofTrackingServiceImpl implements SampleProofTrackingServic if (processOrderCodes.isEmpty()) { return null; } + Map processLabelMap = new HashMap<>(); + for (ProofTrackingProcessColumnData processRow : processRows) { + if (processRow == null || isBlank(processRow.getCode()) || isBlank(processRow.getLabel())) { + continue; + } + String code = processRow.getCode().trim(); + if (!processLabelMap.containsKey(code)) { + processLabelMap.put(code, processRow.getLabel().trim()); + } + } List activeCodes = (preferredActiveCodes == null || preferredActiveCodes.isEmpty()) ? extractActiveProcessCodes(processRows) : preferredActiveCodes; @@ -1106,6 +1116,7 @@ public class SampleProofTrackingServiceImpl implements SampleProofTrackingServic row.setShowAll(showAll); row.setProcessOrderCodes(new ArrayList<>(processOrderCodes)); row.setProcessCodes(showAll ? new ArrayList<>(processOrderCodes) : validCodes); + row.setProcessLabelMap(processLabelMap); return row; }