|
|
@@ -76,6 +76,7 @@ import org.springblade.system.user.entity.User;
|
|
|
import org.springblade.system.user.feign.IUserClient;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
+import org.springframework.util.StringUtils;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
import java.math.BigInteger;
|
|
|
@@ -6099,8 +6100,8 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
|
|
|
List<FeeCenterReports> feeCenterD = feeCenterReportsD.stream().filter(e -> e.getFeeCnName().equals(fee.getFeeCnName())
|
|
|
&& fee.getBillCorpCnName().equals(e.getBillCorpCnName())).collect(Collectors.toList());
|
|
|
if (!feeCenterD.isEmpty()) {
|
|
|
- feeCenterReports1.setAmountD(fee.getAmountD());
|
|
|
- feeCenterReports1.setAmountLocD(fee.getAmountLocD());
|
|
|
+ feeCenterReports1.setAmountD(fee.getAmountD() == null ? BigDecimal.ZERO : fee.getAmountD());
|
|
|
+ feeCenterReports1.setAmountLocD(fee.getAmountLocD() == null ? BigDecimal.ZERO : fee.getAmountLocD());
|
|
|
feeCenterReports1.setAmountUsdD(fee.getAmountUsdD() == null ? BigDecimal.ZERO : fee.getAmountUsdD());
|
|
|
amountDr = amountDr.add(feeCenterReports1.getAmountD());
|
|
|
amountDrUsd = amountDrUsd.add(feeCenterReports1.getAmountUsdD());
|
|
|
@@ -6111,10 +6112,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
|
|
|
&& !"1".equals(e.getMark())).distinct().findFirst().orElse(null);
|
|
|
if (feeCenterC != null) {
|
|
|
feeCenterC.setMark("1");
|
|
|
- feeCenterReports1.setCorpCnName(feeCenterC.getCorpCnName());
|
|
|
- feeCenterReports1.setAmountC(feeCenterC.getAmountC());
|
|
|
- feeCenterReports1.setAmountLocC(feeCenterC.getAmountLocC());
|
|
|
- feeCenterReports1.setAmountUsdC(feeCenterC.getAmountUsdC());
|
|
|
+ feeCenterReports1.setCorpCnName(StringUtils.hasText(feeCenterC.getCorpCnName())? feeCenterC.getCorpCnName() : "");
|
|
|
+ feeCenterReports1.setAmountC(feeCenterC.getAmountC() == null ? BigDecimal.ZERO : feeCenterC.getAmountC());
|
|
|
+ feeCenterReports1.setAmountLocC(feeCenterC.getAmountLocC() == null ? BigDecimal.ZERO : feeCenterC.getAmountLocC());
|
|
|
+ feeCenterReports1.setAmountUsdC(feeCenterC.getAmountUsdC() == null ? BigDecimal.ZERO : feeCenterC.getAmountUsdC());
|
|
|
countC++;
|
|
|
}
|
|
|
/* if (feeCenterC != null) {
|
liyuan