代码提交 依赖整理 bug解决

无关风月

2024-07-30 90746aae01216e955a5afacc99f17c5eb0563552

 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);
       }
@@ -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);