Merge remote-tracking branch 'origin/master'

mitao

昨天 0d82e9bb89c8569847537f1ce8b9d994bbc4099b

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java

@@ -14,12 +14,14 @@
import com.ruoyi.system.model.AssetInventoryRecord;
import com.ruoyi.system.model.AssetMain;
import com.ruoyi.system.model.AssetType;
import com.ruoyi.system.query.AsseIdleListQuery;
import com.ruoyi.system.query.AssetInventoryListQuery;
import com.ruoyi.system.query.AssetStatisticsListDetailQuery;
import com.ruoyi.system.query.AssetStatisticsListQuery;
import com.ruoyi.system.service.AssetInventoryRecordService;
import com.ruoyi.system.service.AssetMainService;
import com.ruoyi.system.service.AssetTypeService;
import com.ruoyi.system.vo.AssetIdleListVO;
import com.ruoyi.system.vo.AssetInventoryVO;
import com.ruoyi.system.vo.AssetStatisticsDetailVO;
import com.ruoyi.system.vo.AssetStatisticsVO;
@@ -491,4 +493,29 @@
        return pageInfo;
    }

    @Override
    public PageInfo<AssetIdleListVO> pageListIdle(AsseIdleListQuery query) {
        Map<Integer, AssetType> assetTypeMap = assetTypeService.list().stream().collect(
                Collectors.toMap(AssetType::getId, e -> e)
        );
        PageInfo<AssetIdleListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<AssetIdleListVO> list = this.baseMapper.pageListIdle(query,pageInfo);
        for (AssetIdleListVO assetIdleListVO : list) {
            AssetType assetType = assetTypeMap.get(assetIdleListVO.getAssetTypeId());
            if (assetType!=null){
                AssetType parent = assetTypeMap.get(assetType.getParentId());
                assetIdleListVO.setAssetTypeName(parent.getTypeName()+">"+assetType.getTypeName());
            }
        }
        pageInfo.setRecords(list);
        return pageInfo;
    }

    @Override
    public List<AssetIdleListVO> pageListIdleNoLimit(AsseIdleListQuery query) {
        List<AssetIdleListVO> list = this.baseMapper.pageListIdleNoLimit(query);

        return list;
    }

}