Merge remote-tracking branch 'origin/master'

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

@@ -1317,23 +1317,30 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
 
         /*每个委托一个文件*/
         for (Entrust entrust : entrustList) {
-            /* 样品 */
+            EntrustVO entrustVO = entrust.convert(EntrustVO.class);
+            /* 对应的样品 */
             List<EntrustSample> samples = entrustSamples.stream().
                     filter(s -> entrust.getId().equals(s.getEntrustId())).
                     collect(Collectors.toList());
-            /* 该样品对应的项目 */
+            /* 对应样品的所有编号 */
+            List<String> codes = samples.stream().map(s -> s.getCode()).collect(Collectors.toList());
+            /* 对应该项目的所有的样品id */
+            List<Long> currIds = samples.stream().map(s -> s.getId()).collect(Collectors.toList());
+            /* 这些样品对应的项目 */
             List<EntrustSampleItem> currItems = new ArrayList<>();
             if (CollectionUtils.isNotEmpty(samples)) {
-                /* 该样品对应的项目 */
+                /* 这些样品对应的项目 */
                 currItems = items.stream()
-                        .filter(i -> samples.get(0).getId().equals(i.getEntrustSampleId()))
+                        .filter(i -> currIds.contains(i.getEntrustSampleId()))
                         .collect(Collectors.toList());
                 dataMap.put("sample",samples.get(0));
             }  else {
                 dataMap.put("sample",new EntrustSample());
             }
-            /* 委托*/
-            dataMap.put("entrust",entrust);
+            /* 委托 */
+            entrustVO.setSampleQuantityTotal(Long.parseLong(String.valueOf(samples.size())));
+            entrustVO.setCodes(ListToStringUtils.listToString(codes,"、",gangCode));
+            dataMap.put("entrust",entrustVO);
             /* 项目名 */
             Set<String> itemNames = currItems.stream().filter(i -> StringUtils.isNotEmpty(i.getName()))
                     .map(i -> i.getName()).collect(Collectors.toSet());

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

@@ -74,6 +74,7 @@ public class MaterialItemServiceImpl extends BaseServiceImpl<MaterialItemMapper,
             materialItem.setDecide(qualification.getDecide());
             materialItem.setCode(qualification.getCode());
             materialItem.setAccordName(qualification.getAccordName());
+            materialItem.setPrice(qualification.getPrice());
             saveMaterialItemList.add(materialItem);
         }