fix 委托信息

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/baogao/util/PoiTiUtils.java

@@ -8,6 +8,7 @@ import com.deepoove.poi.config.ConfigureBuilder;
 import com.deepoove.poi.data.Includes;
 import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
 import org.apache.commons.collections4.ListUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 
 import org.jeecg.config.JeecgBaseConfig;
@@ -147,10 +148,19 @@ public class PoiTiUtils {
 
     public static Map<String, Object> getJIanceyiju(List<ItdmWeituoYangpinExtend> extendList) {
 
+        List<String> list = new ArrayList<>();
+
+        for (ItdmWeituoYangpinExtend i : extendList) {
+            if (i != null && StringUtils.isNotBlank(i.getStandardRequirement())) {
+                String[] strings = i.getStandardRequirement().split(",");
+                list.addAll(Arrays.asList(strings));
+            }
+        }
+
 
         Map<String, Object> map = new HashMap<>();
-        map.put("standardRequirementStr", extendList.stream().map(ItdmWeituoYangpinExtend::getStandardRequirement).collect(Collectors.joining("、")));
-        map.put("standardRequirementList", extendList.stream().map(ItdmWeituoYangpinExtend::getStandardRequirement).collect(Collectors.toList()));
+        map.put("standardRequirementStr", String.join("、", list));
+        map.put("standardRequirementList", list);
 
 
         return map;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/weituo/dto/WeituoInsertCommand.java

@@ -94,6 +94,9 @@ public class WeituoInsertCommand {
          * 判定依据
          */
         private String judgementBasis;
+
+        private String yijufile;
+
         /**
          * 备注
          */

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/weituo/dto/WeituoUpdateCommand.java

@@ -96,6 +96,9 @@ public class WeituoUpdateCommand {
          * 判定依据
          */
         private String judgementBasis;
+
+        private String yijufile;
+
         /**
          * 备注
          */

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/weituo/entity/ItdmWeituoYangpinExtend.java

@@ -75,6 +75,13 @@ public class ItdmWeituoYangpinExtend implements Serializable {
 	@Excel(name = "判定依据", width = 15)
     @ApiModelProperty(value = "判定依据")
     private String judgementBasis;
+
+    /**判定依据*/
+    @Excel(name = "检测依据文件", width = 15)
+    @ApiModelProperty(value = "检测依据文件")
+    private String yijufile;
+
+
 	/**备注*/
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")

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

@@ -87,7 +87,7 @@ public class ItdmWeituoInfoInfoVO {
 
     @Getter
     @Setter
-    @JsonPropertyOrder({"key", "yangpinKeyId", "testItems", "standardRequirement", "judgementBasis", "beizhu"})
+    @JsonPropertyOrder({"key", "yangpinKeyId", "testItems", "standardRequirement", "judgementBasis","yijufile", "beizhu"})
 
     public static final class WeituoYangPinShiYan {
 
@@ -109,6 +109,11 @@ public class ItdmWeituoInfoInfoVO {
          * 判定依据
          */
         private String judgementBasis;
+
+
+
+        private String yijufile;
+
         /**
          * 备注
          */