From b5ef65d0103a71dc7af2b9be6d2ac43aca5bb726 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 八月 2024 08:59:57 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/HomeStatisticsServiceImpl.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 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 c2110e1..dc0b0b2 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
@@ -44,11 +44,11 @@
if(homeStatisticsQuery.getStoreManagementNo()!=null&&homeStatisticsQuery.getStoreManagementNo()!=""){
wrapper.eq(SlStoreManagement::getStoreManagementNo,homeStatisticsQuery.getStoreManagementNo());
}
- if (homeStatisticsQuery.getStoreManagementGrade()!=0 && homeStatisticsQuery.getStoreManagementGrade()!=null){
+ if (homeStatisticsQuery.getStoreManagementGrade()!=null && homeStatisticsQuery.getStoreManagementGrade()!=0 ){
wrapper.eq(SlStoreManagement::getStoreManagementGrade,homeStatisticsQuery.getStoreManagementGrade());
}
- if (homeStatisticsQuery.getStoreManagementNumber()!=0 && homeStatisticsQuery.getStoreManagementNumber()!=null){
+ if ( homeStatisticsQuery.getStoreManagementNumber()!=null&& homeStatisticsQuery.getStoreManagementNumber()!=0 ){
wrapper.eq(SlStoreManagement::getStoreManagementNumber,homeStatisticsQuery.getStoreManagementNumber());
}
@@ -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);
}
@@ -151,11 +154,15 @@
goodsMaterialsNmVO goodsMaterialsNmVO=new goodsMaterialsNmVO();
String key = entry.getKey();
goodsMaterialsNmVO.setGoodsMaterialsName(key);
+ goodsMaterialsNmVO.setGoodsMaterialsId(entry.getValue().get(0).getId());
List<homeVO> value = entry.getValue();
// 处理键和值
- Long a=0L;
+ int a=0;
for (homeVO vo : value) {
- a=a+vo.getGoodsMaterialsNum();
+ if (vo.getGoodsMaterialsNum()== null){
+ vo.setGoodsMaterialsNum(0L);
+ }
+ a=a+vo.getGoodsMaterialsNum().intValue();
}
goodsMaterialsNmVO.setGoodsMaterialsNum(a);
goodsMaterialsNmVOS.add(goodsMaterialsNmVO);
@@ -170,18 +177,20 @@
goodsMaterialsNmVO goodsMaterialsNmVO1=new goodsMaterialsNmVO();
String key = entry.getKey();
goodsMaterialsNmVO1.setGoodsMaterialsName(key);
+ goodsMaterialsNmVO1.setGoodsMaterialsId(entry.getValue().get(0).getId());
List<homeVO> value = entry.getValue();
// 处理键和值
- Long a=0L;
+ int a=0;
for (homeVO vo : value) {
- a=a+vo.getGoodsMaterialsNum();
+ if (vo.getGoodsMaterialsNum()== null){
+ vo.setGoodsMaterialsNum(0L);
+ }
+ a=a+vo.getGoodsMaterialsNum().intValue();
}
goodsMaterialsNmVO1.setGoodsMaterialsNum(a);
goodsMaterialsNmVOS1.add(goodsMaterialsNmVO1);
}
-
- homeStatisticsVO.setGoodsMaterialsxiaohao(goodsMaterialsNmVOS);
-
+ homeStatisticsVO.setGoodsMaterialsxiaohao(goodsMaterialsNmVOS1);
return homeStatisticsVO;
}
}
--
Gitblit v1.7.1