森林防火 供应商管理

rentaiming

2024-07-21 6c696606a420be0b99f820807045b2f21b05266e

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java

@@ -18,6 +18,7 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@@ -46,19 +47,19 @@
    @Override
    public PageDTO<ManagementGoodsMaterialsVO> getManagementGoodsMaterialsList(ManagementGoodsMaterialsQuery managementGoodsMaterialsQuery) {
        LambdaQueryWrapper<SlStoreManagement> wrapper= Wrappers.lambdaQuery();
        if (managementGoodsMaterialsQuery.getStoreManagementName()!=null){
        if (managementGoodsMaterialsQuery.getStoreManagementName()!=null&&managementGoodsMaterialsQuery.getStoreManagementName()!=""){
            wrapper.like(SlStoreManagement::getStoreManagementName,managementGoodsMaterialsQuery.getStoreManagementName());
        }
        if (managementGoodsMaterialsQuery.getStoreManagementNo()!=null){
        if (managementGoodsMaterialsQuery.getStoreManagementNo()!=null&&managementGoodsMaterialsQuery.getStoreManagementNo()!=""){
            wrapper.eq(SlStoreManagement::getStoreManagementNo,managementGoodsMaterialsQuery.getStoreManagementNo());
        }
        if (managementGoodsMaterialsQuery.getCityCode()!=null){
        if (managementGoodsMaterialsQuery.getCityCode()!=null&&managementGoodsMaterialsQuery.getCityCode()!=""){
            wrapper.eq(SlStoreManagement::getCityCode,managementGoodsMaterialsQuery.getCityCode());
        }
        if (managementGoodsMaterialsQuery.getCountyCode()!=null){
        if (managementGoodsMaterialsQuery.getCountyCode()!=null&&managementGoodsMaterialsQuery.getCountyCode()!=""){
            wrapper.eq(SlStoreManagement::getCountyCode,managementGoodsMaterialsQuery.getCountyCode());
        }
        if (managementGoodsMaterialsQuery.getTownCode()!=null){
        if (managementGoodsMaterialsQuery.getTownCode()!=null&&managementGoodsMaterialsQuery.getTownCode()!=""){
            wrapper.eq(SlStoreManagement::getTownCode,managementGoodsMaterialsQuery.getTownCode());
        }
        List<SlStoreManagement> slStoreManagements = slStoreManagementMapper.selectList(wrapper);
@@ -67,7 +68,7 @@
                .collect(Collectors.toSet());

        LambdaQueryWrapper<SlGoodsMaterials> wrapper1= Wrappers.lambdaQuery();
        if (managementGoodsMaterialsQuery.getGoodsMaterialsName()!=null){
        if (managementGoodsMaterialsQuery.getGoodsMaterialsName()!=null&&managementGoodsMaterialsQuery.getGoodsMaterialsName()!=""){
            wrapper1.like(SlGoodsMaterials::getGoodsMaterialsName,managementGoodsMaterialsQuery.getGoodsMaterialsName());
        }

@@ -83,9 +84,17 @@

        if (slVolumeProductionIdList.size()>0){
            wrapper3.in(ManagementGoodsMaterials::getManagementId,slVolumeProductionIdList);
        }else{
            slVolumeProductionIdList=new HashSet<>();
            slVolumeProductionIdList.add(0L);
            wrapper3.in(ManagementGoodsMaterials::getGoodsMaterialsId,slVolumeProductionIdList);
        }
        if (SlGoodsMaterialsList.size()>0){
            wrapper3.in(ManagementGoodsMaterials::getGoodsMaterialsId,SlGoodsMaterialsList);
        }else{
            SlGoodsMaterialsList=new HashSet<>();
            SlGoodsMaterialsList.add(0L);
            wrapper3.in(ManagementGoodsMaterials::getGoodsMaterialsId,SlGoodsMaterialsList);
        }
        wrapper3.apply("repertory_zhai<repertory");
        wrapper3.eq( ManagementGoodsMaterials::getDelFlag,0);