Browse Source

显示label

master
han\hanst 1 week ago
parent
commit
558bc1aefe
  1. 6
      src/main/java/com/xujie/sys/modules/sampletracking/data/ProofTrackingBuProcessConfigData.java
  2. 11
      src/main/java/com/xujie/sys/modules/sampletracking/service/impl/SampleProofTrackingServiceImpl.java

6
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<String> processOrderCodes;
/**
* 前端字段工序编码与显示名称映射避免配置中仅有编码时回显为 value
*/
private Map<String, String> processLabelMap;
private String createBy;
private String updateBy;
}

11
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<String, String> 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<String> 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;
}

Loading…
Cancel
Save