射洪城投
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
mitao
10 小时以前 7c0a8a91ae6d1c684e7a358929f4bd04f3f4bfe8 
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetWarehouseServiceImpl.java


@@ -6,18 +6,18 @@


import com.baomidou.mybatisplus.core.metadata.IPage;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.ruoyi.common.core.domain.entity.SysDept;


import com.ruoyi.common.core.domain.entity.TDept;


import com.ruoyi.common.exception.ServiceException;


import com.ruoyi.common.utils.SecurityUtils;


import com.ruoyi.common.utils.StringUtils;


import com.ruoyi.system.dto.asset.AssetWarehouseDTO;


import com.ruoyi.system.mapper.AssetWarehouseMapper;


import com.ruoyi.system.mapper.SysDeptMapper;


import com.ruoyi.system.model.AssetInventoryRecord;


import com.ruoyi.system.model.AssetWarehouse;


import com.ruoyi.system.query.AssetWarehousePageQuery;


import com.ruoyi.system.service.AssetInventoryRecordService;


import com.ruoyi.system.service.AssetWarehouseService;


import com.ruoyi.system.service.TDeptService;


import com.ruoyi.system.vo.asset.AssetWarehouseVO;


import lombok.RequiredArgsConstructor;


import org.springframework.stereotype.Service;


@@ -40,7 +40,7 @@


public class AssetWarehouseServiceImpl extends ServiceImpl<AssetWarehouseMapper, AssetWarehouse> implements AssetWarehouseService {




    private final AssetInventoryRecordService assetInventoryRecordService;


    private final SysDeptMapper sysDeptMapper;


    private final TDeptService deptService;




    @Override


    public IPage<AssetWarehouseVO> getPageList(AssetWarehousePageQuery pageQuery) {


@@ -60,9 +60,9 @@


        List<Integer> warehouseIds = assetWarehouseVOS.stream().map(AssetWarehouseVO::getId).collect(Collectors.toList());


        List<Integer> deptIds = assetWarehouseVOS.stream().map(AssetWarehouseVO::getDeptId).distinct().collect(Collectors.toList());




        List<SysDept> sysDepts = sysDeptMapper.selectByIds(deptIds);


        List<TDept> sysDepts = deptService.listByIds(deptIds);


        Map<Integer, String> deptMap = sysDepts.stream()


                .collect(Collectors.toMap(item->item.getDeptId().intValue(), SysDept::getDeptName));


                .collect(Collectors.toMap(TDept::getId, TDept::getDeptName));


        //查询库存数量


        Map<Integer, List<AssetInventoryRecord>> inventoryRecordMap = assetInventoryRecordService.lambdaQuery()


                .in(AssetInventoryRecord::getWarehouseId, warehouseIds)


@@ -72,10 +72,11 @@


            List<AssetInventoryRecord> assetInventoryRecords = inventoryRecordMap.get(warehouseVO.getId());


            if (CollUtil.isEmpty(assetInventoryRecords)) {


                warehouseVO.setCurrentStock(0);


            } else {


                long inStock = assetInventoryRecords.stream().filter(item -> item.getType().equals(0)).count();


                long outStock = assetInventoryRecords.stream().filter(item -> item.getType().equals(1)).count();


                warehouseVO.setCurrentStock((int) (inStock - outStock));


            }


            long inStock = assetInventoryRecords.stream().filter(item -> item.getType().equals(0)).count();


            long outStock = assetInventoryRecords.stream().filter(item -> item.getType().equals(1)).count();


            warehouseVO.setCurrentStock((int) (inStock - outStock));


            //设置部门名称


            warehouseVO.setDeptName(deptMap.getOrDefault(warehouseVO.getDeptId(), ""));


        });