From 5667d14c708f9244fe2419707f98ff472ca23480 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 30 七月 2024 16:30:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/HomeStatisticsServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/HomeStatisticsServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/HomeStatisticsServiceImpl.java
index 8a4a08e..6a91647 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/HomeStatisticsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/HomeStatisticsServiceImpl.java
@@ -120,6 +120,9 @@
repertoryZhai=repertoryZhai+li1.getCkNum();
}
}
+ if (li.getRkPice() == null){
+ li.setRkPice(BigDecimal.ZERO);
+ }
d=d+li.getRkPice().multiply(new BigDecimal(li.getRkPice().intValue())).doubleValue();
li.setRepertoryZhai(repertoryZhai);
}
@@ -155,6 +158,9 @@
// 处理键和值
Long a=0L;
for (homeVO vo : value) {
+ if (vo.getGoodsMaterialsNum()== null){
+ vo.setGoodsMaterialsNum(0L);
+ }
a=a+vo.getGoodsMaterialsNum();
}
goodsMaterialsNmVO.setGoodsMaterialsNum(a);
@@ -174,6 +180,9 @@
// 处理键和值
Long a=0L;
for (homeVO vo : value) {
+ if (vo.getGoodsMaterialsNum()== null){
+ vo.setGoodsMaterialsNum(0L);
+ }
a=a+vo.getGoodsMaterialsNum();
}
goodsMaterialsNmVO1.setGoodsMaterialsNum(a);
--
Gitblit v1.7.1