|
|
|
@ -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; |
|
|
|
} |
|
|
|
|
|
|
|
|