|
|
@@ -451,6 +451,24 @@ public class ReportService {
|
|
|
JSONObject jObject = JSONObject.parseObject(list.get(0).get("f_query_ivt_rds").toString());
|
|
|
List dataList = jObject.get("data") != null ? JSONObject.parseArray(jObject.get("data").toString())
|
|
|
.toJavaList(Map.class) : new ArrayList();
|
|
|
+ if (!dataList.isEmpty()) {
|
|
|
+ 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());
|
|
|
+ }
|
|
|
+ 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());
|
|
|
+ }
|
|
|
+ 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());
|
|
|
+ }
|
|
|
+ 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());
|
|
|
+ }
|
|
|
+ dataList.clear();
|
|
|
+ dataList.addAll(newDataList);
|
|
|
+ }
|
|
|
|
|
|
// 定义返回值
|
|
|
PageList data = new PageList<>();
|