Merge remote-tracking branch 'origin/master'

rentaiming

2024-07-30 425e388128ba159fb9ff714d6bde24caa25e85ef

 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()!=null && homeStatisticsQuery.getStoreManagementGrade()!=0){
        if (homeStatisticsQuery.getStoreManagementGrade()!=null &&  homeStatisticsQuery.getStoreManagementGrade()!=0 ){
            wrapper.eq(SlStoreManagement::getStoreManagementGrade,homeStatisticsQuery.getStoreManagementGrade());
        }

        if (homeStatisticsQuery.getStoreManagementNumber()!=null && homeStatisticsQuery.getStoreManagementNumber()!=0  ){
        if ( homeStatisticsQuery.getStoreManagementNumber()!=null&& homeStatisticsQuery.getStoreManagementNumber()!=0 ){
            wrapper.eq(SlStoreManagement::getStoreManagementNumber,homeStatisticsQuery.getStoreManagementNumber());
        }

@@ -180,6 +180,9 @@
            // 处理键和值
            Long a=0L;
            for (homeVO vo : value) {
                if (vo.getGoodsMaterialsNum()== null){
                    vo.setGoodsMaterialsNum(0L);
                }
                a=a+vo.getGoodsMaterialsNum();
            }
            goodsMaterialsNmVO1.setGoodsMaterialsNum(a);