检测委托书导出修改

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustServiceImpl.java

@@ -1104,13 +1104,19 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
             List<EntrustSample> samples = entrustSamples.stream().
                     filter(s -> entrust.getId().equals(s.getEntrustId())).
                     collect(Collectors.toList());
-            /* 项目 */
-            Set<String> itemNames = items.stream().map(i -> i.getName()).collect(Collectors.toSet());
-            Set<String> standards = items.stream()
+            /* 该样品对应的项目 */
+            List<EntrustSampleItem> currItems = items.stream()
+                    .filter(i -> samples.get(0).getId().equals(i.getEntrustSampleId()))
+                    .collect(Collectors.toList());
+            /* 项目名 */
+            Set<String> itemNames = currItems.stream().filter(i -> StringUtils.isNotEmpty(i.getName()))
+                    .map(i -> i.getName()).collect(Collectors.toSet());
+            /* 执行标准 */
+            Set<String> standards = currItems.stream()
                     .filter(i -> StringUtils.isNotEmpty(i.getStandard()))
                     .map(i -> i.getStandard()).collect(Collectors.toSet());
             dataMap.put("entrust",entrust);
-            /* 委托时间和样品收受时间 */
+            /* 委托时间和样品接收时间 */
             dataMap.put("entrustTimeStr", StringHandleUtils.parse(DateUtils.toYearMonthDay(entrust.getEntrustTime()),gangCode));
             dataMap.put("entrustTimeStrCn", StringHandleUtils.parse(DateUtils.toYearMonthDayChinese(entrust.getEntrustTime()),gangCode));
             dataMap.put("entrustTimeStrPoint", StringHandleUtils.parse(DateUtils.toYearMonthDayPoint(entrust.getEntrustTime()),gangCode));