Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API

src/main/java/com/steerinfo/dil/controller/AmsContractTruckPriceController.java

@@ -99,6 +99,18 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
             mapValue.put("orderField",null);
         }
         List<Map<String, Object>> amsContractTransportPrice1 = amsContractTruckPriceService.getInwardContractPrice(mapValue);
+        if (mapValue.get("materialNames")!=null && !"".equals(mapValue.get("materialNames"))) {
+            String materialNames = mapValue.get("materialNames").toString();
+            List<Map<String, Object>> amsContractTransportPrice2=new ArrayList<>();
+            amsContractTransportPrice1.forEach(map->{
+                if (map.get("materialNames")!=null && !"".equals(map.get("materialNames"))) {
+                    if (materialNames.equals("["+map.get("materialNames")+"]")) {
+                        amsContractTransportPrice2.add(map);
+                    }
+                }
+            });
+            amsContractTransportPrice1=amsContractTransportPrice2;
+        }
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsContractTransportPrice1);
         return success(pageList);
     }