委托按id查询返回的数据在试验信息里加上该样品规格型号

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/weituo/convert/WeituoConvert.java

@@ -53,6 +53,8 @@ public interface WeituoConvert {
 
     @Mapping(target = "yangpinKeyId", expression = "java(list.stream().filter(i -> i.getId().equals(info.getYangpinId()))" +
             ".map(ItdmWeituoYangpin::getSampleName).findFirst().orElse(null))")
+    @Mapping(target = "sampleModelSpecification", expression = "java(list.stream().filter(i -> i.getId().equals(info.getYangpinId()))" +
+            ".map(ItdmWeituoYangpin::getSampleModelSpecification).findFirst().orElse(null))")
     ItdmWeituoInfoInfoVO.WeituoYangPinShiYan convert(ItdmWeituoYangpinExtend info, List<ItdmWeituoYangpin> list);
 
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/weituo/vo/ItdmWeituoInfoInfoVO.java

@@ -85,16 +85,20 @@ public class ItdmWeituoInfoInfoVO {
 
     @Getter
     @Setter
-    @JsonPropertyOrder({"key", "yangpinKeyId", "testItems", "standardRequirement", "judgementBasis","yijufile", "beizhu"})
+    @JsonPropertyOrder({"key", "yangpinKeyId","sampleModelSpecification", "testItems", "standardRequirement", "judgementBasis","yijufile", "beizhu"})
 
     public static final class WeituoYangPinShiYan {
 
 
         /**
-         * 样品id
+         * 样品id——实际是将样品名称返给前端
          */
         private String yangpinKeyId;
         /**
+         * 样品规格型号
+         */
+        private String sampleModelSpecification;
+        /**
          * 检测项目
          */
         private String testItems;