czt
2026-01-12 82e3be7117a57a4abec0e1c49a5b3bcffb588e81
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SuperInventoryReportService.java
@@ -77,7 +77,6 @@
            param.setDeptId(param.getCustomerId());
        }
        //test提交
        //test提交2
        //收储公司,所属库区查询均为空,则查询默认库区
        if (StringUtils.isEmpty(param.getCustomerId()) && StringUtils.isEmpty(param.getDeptId())) {
            param.setDeptId(deptId);
@@ -251,6 +250,11 @@
            result.add(data);
        }
        if(result.isEmpty()){
            //没有数据时将columsMap中的数据添加到result中作为默认数据
            result.addAll(columsMap.values());
        }
        return result;
    }
@@ -263,7 +267,8 @@
        if (StringUtils.isNotBlank(param.getDeptId())) {
            depotStoreQueryWrapper.likeRight("dept_id", param.getDeptId());
        }
        depotStoreQueryWrapper.between("create_time", param.getStart(), param.getEnd());
        depotStoreQueryWrapper.ge("create_time", param.getStart());
        depotStoreQueryWrapper.le("create_time", param.getEnd());
        depotStoreQueryWrapper.orderByAsc("create_time");
        return depotStoreMapper.selectList(depotStoreQueryWrapper);
    }
@@ -277,7 +282,8 @@
        if (StringUtils.isNotBlank(param.getDeptId())) {
            inoutRecordQueryWrapper.likeRight("dept_id", param.getDeptId());
        }
        inoutRecordQueryWrapper.between("create_time", param.getStart(), param.getEnd());
        inoutRecordQueryWrapper.ge("create_time", param.getStart());
        inoutRecordQueryWrapper.le("create_time", param.getEnd());
        inoutRecordQueryWrapper.orderByAsc("create_time");
        return inoutRecordMapper.selectList(inoutRecordQueryWrapper);
    }
@@ -291,7 +297,8 @@
        if (StringUtils.isNotBlank(param.getDeptId())) {
            inoutStockChangeQueryWrapper.likeRight("dept_id", param.getDeptId());
        }
        inoutStockChangeQueryWrapper.between("create_time", param.getStart(), param.getEnd());
        inoutStockChangeQueryWrapper.ge("create_time", param.getStart());
        inoutStockChangeQueryWrapper.le("create_time", param.getEnd());
        inoutStockChangeQueryWrapper.orderByAsc("create_time");
        return inoutStockChangeMapper.selectList(inoutStockChangeQueryWrapper);
    }
@@ -305,7 +312,8 @@
        if (StringUtils.isNotBlank(param.getDeptId())) {
            inoutLossOverQueryWrapper.likeRight("dept_id", param.getDeptId());
        }
        inoutLossOverQueryWrapper.between("create_time", param.getStart(), param.getEnd());
        inoutLossOverQueryWrapper.ge("create_time", param.getStart());
        inoutLossOverQueryWrapper.le("create_time", param.getEnd());
        inoutLossOverQueryWrapper.orderByAsc("create_time");
        return inoutLossOverMapper.selectList(inoutLossOverQueryWrapper);
    }