From 4900cf71fee9dd676a2e2098669f578945a60472 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 20 Aug 2019 15:23:45 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=B5=E8=A1=A8=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/schedule/PowerBillAutoBuildSchedule.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java index a12725800..0456512f6 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java @@ -11,6 +11,7 @@ import com.iformall.mapper.WxMerchantShopMapper; import com.iformall.mapper.WxPowerBillAutoConfigMapper; import com.iformall.service.WxBillDailyService; import com.iformall.service.kw.KwMeterDataService; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -27,6 +28,7 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @author gongbiao @@ -61,7 +63,11 @@ public class PowerBillAutoBuildSchedule { public void powerBillAutoConfigStart() { logger.info("自动生成电费账单开始...."); int dayOfMonth = LocalDate.now().getDayOfMonth(); - List wxPowerBillAutoConfigs = wxPowerBillAutoConfigMapper.selectAll(); + List wxPowerBillAutoConfigs = wxPowerBillAutoConfigMapper.selectAll() + .stream().filter(config -> StringUtils.isNotEmpty(config.getUnitPrice()) + && StringUtils.isNotEmpty(config.getBuildDay()) + && StringUtils.isNotEmpty(config.getReceiveDay())) + .collect(Collectors.toList()); for (int i = 0; i < wxPowerBillAutoConfigs.size(); i++) { WxPowerBillAutoConfig wxPowerBillAutoConfig = wxPowerBillAutoConfigs.get(i); if (wxPowerBillAutoConfig.getBuildDay().equals(dayOfMonth)) {