|
|
@@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletRequest;
|
|
|
import java.io.IOException;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
-import java.util.Objects;
|
|
|
import java.util.concurrent.ConcurrentHashMap;
|
|
|
import java.util.concurrent.atomic.AtomicInteger;
|
|
|
import java.util.stream.Collectors;
|
|
|
@@ -107,6 +106,7 @@ public class CustomerController {
|
|
|
if (MapUtils.isNotEmpty(excel)) for (Map.Entry<String, List<CustomerInfo>> dataEntry : excel.entrySet()) {
|
|
|
//获取数据
|
|
|
List<CustomerInfo> dates = dataEntry.getValue().stream()
|
|
|
+ .filter(data -> data != null && StringUtils.isNotBlank(data.getCode()))
|
|
|
.peek(info -> {
|
|
|
//抄表周期
|
|
|
if (StringUtils.isNotBlank(info.getReadCycleName()))
|
|
|
@@ -181,7 +181,7 @@ public class CustomerController {
|
|
|
if (MapUtils.isNotEmpty(excel)) for (Map.Entry<String, List<CustomerMeterRead>> dataEntry : excel.entrySet()) {
|
|
|
//获取数据
|
|
|
List<CustomerMeterRead> dates = dataEntry.getValue().stream()
|
|
|
- .filter(Objects::nonNull)
|
|
|
+ .filter(data -> data != null && StringUtils.isNotBlank(data.getCode()))
|
|
|
//设置时间
|
|
|
.peek(read -> {
|
|
|
if (read.getReadDate() != null)
|
