From 0f6d0d5872bdff52add36e44523aaa27206ad3db Mon Sep 17 00:00:00 2001 From: jiangc <12345678> Date: Tue, 25 Feb 2025 13:45:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E4=BD=99=E9=A2=9D=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=202025=E5=B9=B42=E6=9C=8825=E6=97=A513:44:52?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../carbon/service/impl/QyCarbonAssetServiceImpl.java | 2 +- .../carbon/service/impl/QyCarbonQuotaInfoServiceImpl.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/qingyuan/src/main/java/com/thing/qingyuan/carbon/service/impl/QyCarbonAssetServiceImpl.java b/modules/qingyuan/src/main/java/com/thing/qingyuan/carbon/service/impl/QyCarbonAssetServiceImpl.java index c5fb47c..892b69c 100644 --- a/modules/qingyuan/src/main/java/com/thing/qingyuan/carbon/service/impl/QyCarbonAssetServiceImpl.java +++ b/modules/qingyuan/src/main/java/com/thing/qingyuan/carbon/service/impl/QyCarbonAssetServiceImpl.java @@ -352,7 +352,7 @@ public class QyCarbonAssetServiceImpl implements QyCarbonAssetService { private static void calBalanceAndUnitPrice(List carbonList) { //总数 - BigDecimal sum = carbonList.stream().filter(s -> !"1".equals(s.getState())) + BigDecimal sum = carbonList.stream().filter(s -> "2".equals(s.getState())||"3".equals(s.getState())) .map(QyCarbonAssetDTO::getTotal) .reduce(BigDecimal.ZERO, BigDecimal::add); //核销和卖出 diff --git a/modules/qingyuan/src/main/java/com/thing/qingyuan/carbon/service/impl/QyCarbonQuotaInfoServiceImpl.java b/modules/qingyuan/src/main/java/com/thing/qingyuan/carbon/service/impl/QyCarbonQuotaInfoServiceImpl.java index facaea9..6b298d1 100644 --- a/modules/qingyuan/src/main/java/com/thing/qingyuan/carbon/service/impl/QyCarbonQuotaInfoServiceImpl.java +++ b/modules/qingyuan/src/main/java/com/thing/qingyuan/carbon/service/impl/QyCarbonQuotaInfoServiceImpl.java @@ -9,6 +9,7 @@ import com.thing.qingyuan.carbon.entity.QyCarbonQuotaInfoEntity; import com.thing.qingyuan.carbon.mapper.QyCarbonQuotaInfoMapper; import com.thing.qingyuan.carbon.service.QyCarbonQuotaInfoService; import com.thing.qingyuan.carbon.util.Constant; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -25,6 +26,9 @@ public class QyCarbonQuotaInfoServiceImpl extends BaseServiceImpl params) { QueryWrapper queryWrapper = new QueryWrapper(); + if(MapUtils.isEmpty(params)){ + return queryWrapper; + } if (params.containsKey("state")) { queryWrapper.eq("state", params.get("state")); }