|
|
@@ -455,16 +455,16 @@ public class ReportService {
|
|
|
List<Map<String,Object>> newDataList = new ArrayList<>();
|
|
|
newDataList.addAll(dataList);
|
|
|
if (Boolean.parseBoolean(String.valueOf(param.get("openingNumberZero")))) {
|
|
|
- newDataList = newDataList.stream().filter((Map data) -> Double.valueOf(String.valueOf( data.get("openingIvtQty"))) == 0).collect(Collectors.toList());
|
|
|
+ newDataList = newDataList.stream().filter((Map data) -> Double.valueOf(String.valueOf( data.get("openingIvtQty"))) != 0).collect(Collectors.toList());
|
|
|
}
|
|
|
if (Boolean.parseBoolean(String.valueOf(param.get("currentNumberZero")))) {
|
|
|
- newDataList = newDataList.stream().filter((Map data) -> Double.valueOf(String.valueOf(data.get("currentIntoQty"))) == 0).collect(Collectors.toList());
|
|
|
+ newDataList = newDataList.stream().filter((Map data) -> Double.valueOf(String.valueOf(data.get("currentIntoQty"))) != 0).collect(Collectors.toList());
|
|
|
}
|
|
|
if (Boolean.parseBoolean(String.valueOf(param.get("currentOutNumberZero")))) {
|
|
|
- newDataList = newDataList.stream().filter((Map data) -> Double.valueOf(String.valueOf(data.get("currentOutQty"))) == 0).collect(Collectors.toList());
|
|
|
+ newDataList = newDataList.stream().filter((Map data) -> Double.valueOf(String.valueOf(data.get("currentOutQty"))) != 0).collect(Collectors.toList());
|
|
|
}
|
|
|
if (Boolean.parseBoolean(String.valueOf(param.get("endingIvtNumberZero")))) {
|
|
|
- newDataList = newDataList.stream().filter((Map data) -> Double.valueOf(String.valueOf(data.get("endingIvtQty"))) == 0).collect(Collectors.toList());
|
|
|
+ newDataList = newDataList.stream().filter((Map data) -> Double.valueOf(String.valueOf(data.get("endingIvtQty"))) != 0).collect(Collectors.toList());
|
|
|
}
|
|
|
dataList.clear();
|
|
|
dataList.addAll(newDataList);
|
|
|
@@ -549,7 +549,7 @@ public class ReportService {
|
|
|
return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL, "请检查分页参数!");
|
|
|
}
|
|
|
|
|
|
- List<Map<String, Object>> list = new ArrayList<>();
|
|
|
+ List<Map<String, Object>> list = new ArrayList<>();
|
|
|
List<Object> objects = new ArrayList<>();
|
|
|
if (param.get("macIds") instanceof ArrayList<?>) {
|
|
|
for (Object o : (List<?>) param.get("macIds")) {
|