|
@@ -93,6 +93,9 @@ public class FirstDeliveryValidServiceImpl implements FirstDeliveryValidService
|
|
|
List<JSONObject> list = this.analysisFile(file, fileName);
|
|
|
for (JSONObject object : list) {
|
|
|
FirstDeliveryValidRatio material = new FirstDeliveryValidRatio(object);
|
|
|
+ if ("走量".equals(material.getOperationLabel())) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
material.setDeliveryYear(year);
|
|
|
dataList.add(material);
|
|
|
}
|
|
@@ -206,6 +209,7 @@ public class FirstDeliveryValidServiceImpl implements FirstDeliveryValidService
|
|
|
page.setTotal(total);
|
|
|
return Result.OK(page);
|
|
|
}
|
|
|
+
|
|
|
public static List<JSONObject> analysisFile(MultipartFile file, String fileName) throws Exception {
|
|
|
JSONObject returnJson = new JSONObject();
|
|
|
Workbook workbook = null;
|